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

[S] Change in osmo-ttcn3-hacks[master]: msc: expand TC_lu_tmsi_noauth_notmsi

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36460?usp=email ) Change subject: msc: expand TC_lu_tmsi_noauth_notmsi ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36460?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: I5e596597add7d585efd27c850067b8d7ba34ecc0 Gerrit-Change-Number: 36460 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Mar 2024 07:32:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_lu_tmsi_noauth_notmsi

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36459?usp=email ) Change subject: msc: add TC_lu_tmsi_noauth_notmsi ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File msc/MSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36459/comment/ce6270ac_20e9… PS1, Line 7312: valueof cosmetic: `use_mi` is a template parameter, so you can pass `ts_MI_TMSI_LV` directly, without having to use `valueof()`. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36459?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: If10b9987395670b084ff8ad6d1f033ff46896d75 Gerrit-Change-Number: 36459 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Mar 2024 07:28:10 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: add mi arg to f_perform_lu()

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36458?usp=email ) Change subject: msc: add mi arg to f_perform_lu() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36458?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: I31aad8eb751528f7237a892702e87ee5855cabbb Gerrit-Change-Number: 36458 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Mar 2024 07:23:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: allow f_verify_vty_lac_ci() to pass for CompL3 by TMSI MI

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36457?usp=email ) Change subject: msc: allow f_verify_vty_lac_ci() to pass for CompL3 by TMSI MI ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36457?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: I4d719928f04e5a47d415c38f835451b1f10c713d Gerrit-Change-Number: 36457 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Mar 2024 07:15:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_expect_paging(): better detect failure

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36456?usp=email ) Change subject: msc: f_expect_paging(): better detect failure ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36456/comment/1adc53a1_a0cb… PS1, Line 1366: if (g_pars.ran_is_geran) { Hm, this could be a single `alt`-statement: ``` alt { [g_pars.ran_is_geran] BSSAP.receive ... [g_pars.ran_is_geran] BSSAP.receive ... [not g_pars.ran_is_geran] BSSAP.receive ... [not g_pars.ran_is_geran] BSSAP.receive ... } ``` ... ideally with a timer. Just an idea. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36456?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: I30273e3882e348a2ded88b7b96a5ec1473a56913 Gerrit-Change-Number: 36456 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Mar 2024 07:14:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_expect_paging(): fix by_tmsi arg

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?usp=email ) Change subject: msc: f_expect_paging(): fix by_tmsi arg ...................................................................... Patch Set 1: (1 comment) File msc/BSC_ConnectionHandler.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455/comment/3a2b1f77_7666… PS1, Line 1360: boolean by_tmsi := true Why not letting the API user pass a TMSI template? ``` function f_expect_paging(template OCT4 tmsi := *) ``` This would be more flexible, one could expect a specific value for instance. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?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: I9434745b7faeb738caafed8080b9f7b1a6a8079a Gerrit-Change-Number: 36455 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Mar 2024 06:59:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ran-emu: allow receiving Paging without a TMSI

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36454?usp=email ) Change subject: ran-emu: allow receiving Paging without a TMSI ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36454?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: I1bdf3488be0f8d4f0905665c4ba642f9468b9777 Gerrit-Change-Number: 36454 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 26 Mar 2024 06:53:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: allow f_verify_vty_lac_ci() to pass for CompL3 by TMSI MI

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36457?usp=email ) Change subject: msc: allow f_verify_vty_lac_ci() to pass for CompL3 by TMSI MI ...................................................................... msc: allow f_verify_vty_lac_ci() to pass for CompL3 by TMSI MI Obviously, when only a TMSI has been used, searching for an IMSI will return no subscriber. Don't fail in that case when testing for verify_vlr := false. Prepares TC_lu_tmsi_noauth_notmsi in If10b9987395670b084ff8ad6d1f033ff46896d75 Related: SYS#6860 OS#4721 Change-Id: I4d719928f04e5a47d415c38f835451b1f10c713d --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/36457/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index ac973d7..df3a1c8 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -827,7 +827,9 @@ } if (not verify_vlr and not connection_present) { - setverdict(fail, "f_verify_vty_lac_ci(verify_vlr := false) called, which requires an active connection, but there is no 'Connection:' part to verify in ", result); + /* If the Compl L3 was done by TMSI, the VLR has no IMSI until the ID Request / Response for IMSI has + * been answered. So if verify_vlr == false, a "missing" connection is one of the expected scenarios. */ + setverdict(pass); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36457?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: I4d719928f04e5a47d415c38f835451b1f10c713d Gerrit-Change-Number: 36457 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: add mi arg to f_perform_lu()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36458?usp=email ) Change subject: msc: add mi arg to f_perform_lu() ...................................................................... msc: add mi arg to f_perform_lu() Allow testing Location Updating by TMSI MI. Prepares for TC_lu_tmsi_noauth_notmsi in If10b9987395670b084ff8ad6d1f033ff46896d75 Change-Id: I31aad8eb751528f7237a892702e87ee5855cabbb --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/58/36458/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index df3a1c8..422390a 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -833,9 +833,15 @@ } } -function f_perform_lu() +function f_perform_lu(template (omit) MobileIdentityLV use_mi := omit) runs on BSC_ConnHdlr { - var PDU_ML3_MS_NW l3_lu := f_build_lu_imsi(g_pars.imsi) + var MobileIdentityLV mi; + if (istemplatekind(use_mi, "omit")) { + mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + } else { + mi := valueof(use_mi); + } + var PDU_ML3_MS_NW l3_lu := f_build_lu(mi); var PDU_DTAP_MT dtap_mt; /* tell GSUP dispatcher to send this IMSI to us */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36458?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: I31aad8eb751528f7237a892702e87ee5855cabbb Gerrit-Change-Number: 36458 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: msc: add TC_lu_tmsi_noauth_notmsi

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36459?usp=email ) Change subject: msc: add TC_lu_tmsi_noauth_notmsi ...................................................................... msc: add TC_lu_tmsi_noauth_notmsi Add test case for handling a LU by TMSI MI when 'no assign-tmsi' is configured. This test will pass from osmo-msc patch I583682d1a35a70b008d7bb2d89ba7c3109a60b21 on Depends: osmo-msc I583682d1a35a70b008d7bb2d89ba7c3109a60b21 Related: SYS#6860 OS#4721 Change-Id: If10b9987395670b084ff8ad6d1f033ff46896d75 --- M msc/MSC_Tests.ttcn 1 file changed, 59 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/59/36459/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 9db18d3..1275656 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7291,10 +7291,52 @@ vc_conn.done; } +/* MSC <-> BSC: ID req/rsp for IMSI */ +private altstep as_id_req_imsi() +runs on BSC_ConnHdlr { + [] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_ID_Req(CM_ID_TYPE_IMSI))) { + var MobileIdentityLV mi := valueof(ts_MI_IMSI_LV(g_pars.imsi)); + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_MM_ID_Rsp(mi))); + repeat; + } +} + +/* MSC is configured to not assign a TMSI; MS sends LU Request with a TMSI MI (from another cell), and MSC shall not use + * that TMSI. */ +private function f_tc_lu_tmsi_noauth_notmsi(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars, t_guard := 20.0); + + /* Perform Location Updating using an unknown TMSI MI. Expect an ID Request to come from the MSC and answer + * that with as_id_req_imsi(). */ + activate(as_id_req_imsi()); + f_perform_lu(use_mi := valueof(ts_MI_TMSI_LV(pars.tmsi))); + + f_sleep(1.0); + + /* Attached by invalid TMSI, and the MSC has asked for the IMSI. Initiate Paging and make sure the MSC doesn't + * use the invalid TMSI for it. */ + f_ran_register_imsi(g_pars.imsi, omit); + f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); + f_expect_paging(by_tmsi := false); +} +testcase TC_lu_tmsi_noauth_notmsi() runs on MTC_CT { + var BSC_ConnHdlrPars pars; + var BSC_ConnHdlr vc_conn; + f_init(); + f_vty_config(MSCVTY, "msc", "no assign-tmsi"); + pars := f_init_pars(101); + pars.net.expect_tmsi := false; + pars.tmsi := '0badbad0'O; + pars.mm_info := false; + vc_conn := f_start_handler_with_pars(refers(f_tc_lu_tmsi_noauth_notmsi), pars); + vc_conn.done; +} + control { execute( TC_cr_before_reset() ); execute( TC_lu_imsi_noauth_tmsi() ); execute( TC_lu_imsi_noauth_notmsi() ); + execute( TC_lu_tmsi_noauth_notmsi() ); execute( TC_lu_imsi_reject() ); execute( TC_lu_imsi_timeout_gsup() ); execute( TC_lu_imsi_auth_tmsi() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36459?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: If10b9987395670b084ff8ad6d1f033ff46896d75 Gerrit-Change-Number: 36459 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: expand TC_lu_tmsi_noauth_notmsi

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36460?usp=email ) Change subject: msc: expand TC_lu_tmsi_noauth_notmsi ...................................................................... msc: expand TC_lu_tmsi_noauth_notmsi From running this test repeatedly, I noticed that osmo-msc's new patch to avoid storing a TMSI may also trigger more evil twin situations in the VLR as described in OS#4721. Always run this test twice, to probe for the evil twin problem. This test will pass from osmo-msc patch Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd on. Depends: osmo-msc Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd Related: SYS#6860 OS#4721 Change-Id: I5e596597add7d585efd27c850067b8d7ba34ecc0 --- M msc/MSC_Tests.ttcn 1 file changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/60/36460/1 diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 1275656..0d89a26 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7318,6 +7318,17 @@ f_ran_register_imsi(g_pars.imsi, omit); f_vty_transceive(MSCVTY, "subscriber imsi " & hex2str(g_pars.imsi) & " paging"); f_expect_paging(by_tmsi := false); + + /* Respond to paging, to clean up internal paging state for this subscriber, so we can get a clean second run + * out of this test code. Don't use the TMSI in the paging response. */ + f_cl3_or_initial_ue(valueof(ts_PAG_RESP(ts_MI_IMSI_LV(pars.imsi)))); + f_mm_common(); + /* The paging was by VTY, so nothing happens, just a release. */ + f_expect_clear(); + + /* Clean up ttcn state for the second test run to work out. */ + f_unregister_gsup_imsi(hex2str(pars.imsi)); + f_ran_unregister_imsi(pars.imsi); } testcase TC_lu_tmsi_noauth_notmsi() runs on MTC_CT { var BSC_ConnHdlrPars pars; @@ -7330,6 +7341,19 @@ pars.mm_info := false; vc_conn := f_start_handler_with_pars(refers(f_tc_lu_tmsi_noauth_notmsi), pars); vc_conn.done; + + /* Now run the same test *again*, to test against an evil twin VLR entry: + * A vlr_subscr with the correct IMSI is now present in the VLR. + * We again ask for a LU with the 0x0bad TMSI. The VLR will initially create another vlr_subsrc(TMSI=0x0bad). + * When it learns the IMSI via ID Request, it needs to realize that this IMSI is already present on the first + * vsub, and sort out the VLR record so that only one entry for this IMSI exists. + */ + pars := f_init_pars(101); + pars.net.expect_tmsi := false; + pars.tmsi := '0badbad0'O; + pars.mm_info := false; + vc_conn := f_start_handler_with_pars(refers(f_tc_lu_tmsi_noauth_notmsi), pars); + vc_conn.done; } control { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36460?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: I5e596597add7d585efd27c850067b8d7ba34ecc0 Gerrit-Change-Number: 36460 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: ran-emu: allow receiving Paging without a TMSI

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36454?usp=email ) Change subject: ran-emu: allow receiving Paging without a TMSI ...................................................................... ran-emu: allow receiving Paging without a TMSI Fix access of non-present tMSI.* if tMSI == omit, allowing to match incoming Paging with a UnitData receiver that has no TMSI. Change-Id: I1bdf3488be0f8d4f0905665c4ba642f9468b9777 --- M library/RAN_Emulation.ttcnpp 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/54/36454/1 diff --git a/library/RAN_Emulation.ttcnpp b/library/RAN_Emulation.ttcnpp index 25727f3..4d9b51b 100644 --- a/library/RAN_Emulation.ttcnpp +++ b/library/RAN_Emulation.ttcnpp @@ -504,8 +504,11 @@ runs on RAN_Emulation_CT return template PDU_BSSAP { if (match(bssap, tr_BSSMAP_Paging)) { var RAN_ConnHdlr client := null; - client := f_imsi_table_find(bssap.pdu.bssmap.paging.iMSI.digits, - bssap.pdu.bssmap.paging.tMSI.tmsiOctets); + var template OCT4 tmsi := omit; + if (ispresent(bssap.pdu.bssmap.paging.tMSI)) { + tmsi := bssap.pdu.bssmap.paging.tMSI.tmsiOctets; + } + client := f_imsi_table_find(bssap.pdu.bssmap.paging.iMSI.digits, tmsi); if (client != null) { log("CommonBssmapUnitdataCallback: IMSI/TMSI found in table, dispatching to ", client); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36454?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: I1bdf3488be0f8d4f0905665c4ba642f9468b9777 Gerrit-Change-Number: 36454 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_expect_paging(): better detect failure

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36456?usp=email ) Change subject: msc: f_expect_paging(): better detect failure ...................................................................... msc: f_expect_paging(): better detect failure When a received Paging mismatches, instead of waiting for timeout, fail immediately. Change-Id: I30273e3882e348a2ded88b7b96a5ec1473a56913 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 26 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/56/36456/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index ed4bed5..ac973d7 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1364,9 +1364,21 @@ tmsi := omit; } if (g_pars.ran_is_geran) { - BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi, tmsi)); + alt { + [] BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi, tmsi)); + [] BSSAP.receive(tr_BSSMAP_Paging(?, *)) { + setverdict(fail, "Paging message doesn't match expectations"); + mtc.stop; + } + } } else { - BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))); + alt { + [] BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))); + [] BSSAP.receive(tr_RANAP_Paging(?, ?)) { + setverdict(fail, "Paging message doesn't match expectations"); + mtc.stop; + } + } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36456?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: I30273e3882e348a2ded88b7b96a5ec1473a56913 Gerrit-Change-Number: 36456 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_expect_paging(): fix by_tmsi arg

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?usp=email ) Change subject: msc: f_expect_paging(): fix by_tmsi arg ...................................................................... msc: f_expect_paging(): fix by_tmsi arg The by_tmsi argument so far had no effect. But I actually need exactly this in upcoming MSC_Tests.TC_lu_tmsi_noauth_notmsi(): expect a Paging with explicitly no TMSI included. Related: SYS#6860 OS#4721 Change-Id: I9434745b7faeb738caafed8080b9f7b1a6a8079a --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/36455/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index b3d915c..ed4bed5 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1359,8 +1359,12 @@ function f_expect_paging(boolean by_tmsi := true) runs on BSC_ConnHdlr { + var template OCT4 tmsi := *; + if (not by_tmsi) { + tmsi := omit; + } if (g_pars.ran_is_geran) { - BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi)); + BSSAP.receive(tr_BSSMAP_Paging(g_pars.imsi, tmsi)); } else { BSSAP.receive(tr_RANAP_Paging(cs_domain, imsi_hex2oct(g_pars.imsi))); } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36455?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: I9434745b7faeb738caafed8080b9f7b1a6a8079a Gerrit-Change-Number: 36455 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-msc[master]: never page for TMSI with 'no assign-tmsi'

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36453?usp=email ) Change subject: never page for TMSI with 'no assign-tmsi' ...................................................................... never page for TMSI with 'no assign-tmsi' With 'no assign-tmsi', regard any TMSI as invalidated at the end of a Location Updating procedure. Hence, avoid paging by TMSI. When 'no assign-tmsi' is set, osmo-msc does not actively assign a new TMSI at the end of the Location Updating. However, it stores any TMSI identity that the MS sends in a Location Updating Request. So far, this caused osmo-msc to use the TMSI that the MS had sent in subsequent Paging, which goes unanswered by the MS. (After the long standing evil twin problem regarding TMSI MI has been fixed in recent Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd, there is no longer an evil twin risked by clearing out a TMSI.) Related: SYS#6860 OS#4721 Change-Id: I583682d1a35a70b008d7bb2d89ba7c3109a60b21 --- M src/libvlr/vlr_lu_fsm.c M tests/msc_vlr/msc_vlr_test_rest.err 2 files changed, 38 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/53/36453/1 diff --git a/src/libvlr/vlr_lu_fsm.c b/src/libvlr/vlr_lu_fsm.c index 7500c86..5d8f78b 100644 --- a/src/libvlr/vlr_lu_fsm.c +++ b/src/libvlr/vlr_lu_fsm.c @@ -469,6 +469,8 @@ lu_compl_vlr_new_tmsi(fi); return; } + /* else, any previously used TMSI is now invalid. */ + vsub->tmsi = GSM_RESERVED_TMSI; /* Location Updating Accept */ vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, GSM_RESERVED_TMSI); @@ -514,6 +516,8 @@ /* Wait for TMSI ack */ return; } + /* else, any previously used TMSI is now invalid. */ + vsub->tmsi = GSM_RESERVED_TMSI; /* No TMSI needed, accept now. */ vlr->ops.tx_lu_acc(lcvp->msc_conn_ref, GSM_RESERVED_TMSI); diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index fae302f..3a6442e 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -527,7 +527,7 @@ DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){LU_COMPL_VLR_S_INIT}: state_chg to LU_COMPL_VLR_S_WAIT_SUB_PRES DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: Received Event LU_COMPL_VLR_E_SUB_PRES_COMPL - sending LU Accept for IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 + attached: now used by 3 (active-conn,vlr_gsup_rx,attached) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + attached: now used by 3 (active-conn,vlr_gsup_rx,attached) DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){LU_COMPL_VLR_S_WAIT_SUB_PRES}: state_chg to LU_COMPL_VLR_S_DONE DVLR vlr_lu_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_LU_COMPL}: Received Event VLR_ULA_E_LU_COMPL_SUCCESS DVLR lu_compl_vlr_fsm(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){LU_COMPL_VLR_S_DONE}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_PARENT, caused by: upd_hlr_vlr_fsm(TMSI-0x23422342:GERAN-A:LU)) @@ -540,15 +540,15 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_AUTHENTICATED}: Received Event MSC_A_EV_UNUSED DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_AUTHENTICATED}: state_chg to MSC_A_ST_RELEASING DBSSAP msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASING}: Releasing: msc_a use is 0 (-) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 + msc_a_fsm_releasing_onenter: now used by 4 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 + vlr_subscr_cancel_attach_fsm: now used by 5 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 - vlr_subscr_cancel_attach_fsm: now used by 4 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + msc_a_fsm_releasing_onenter: now used by 4 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 + vlr_subscr_cancel_attach_fsm: now used by 5 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter,vlr_subscr_cancel_attach_fsm) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - vlr_subscr_cancel_attach_fsm: now used by 4 (active-conn,vlr_gsup_rx,attached,msc_a_fsm_releasing_onenter) DREF msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASING}: + wait-Clear-Complete: now used by 1 (wait-Clear-Complete) DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASING}: RAN encode: CLEAR_COMMAND on GERAN-A DMSC dummy_msc_i(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 - msc_a_fsm_releasing_onenter: now used by 3 (active-conn,vlr_gsup_rx,attached) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - msc_a_fsm_releasing_onenter: now used by 3 (active-conn,vlr_gsup_rx,attached) DVLR upd_hlr_vlr_fsm(TMSI-0x23422342:GERAN-A:LU){UPD_HLR_VLR_S_DONE}: Deallocated, including all deferred deallocations -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 - vlr_gsup_rx: now used by 2 (active-conn,attached) +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - vlr_gsup_rx: now used by 2 (active-conn,attached) <-- GSUP rx OSMO_GSUP_MSGT_UPDATE_LOCATION_RESULT: vlr_gsupc_read_cb() returns 0 bssap_clear_sent == 1 - LU was successful, and the conn has already been closed @@ -566,19 +566,19 @@ DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASED}: Removing from parent msub_fsm DREF msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASED}: max total use count was 3 DMSC msub_fsm{active}: Received Event MSUB_EV_ROLE_TERMINATED -DMSC msub(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342) MSC-A terminated -DMSC msub(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342) 1 MSC-I still active +DMSC msub(IMSI-901700000004620:MSISDN-46071) MSC-A terminated +DMSC msub(IMSI-901700000004620:MSISDN-46071) 1 MSC-I still active DMSC msub_fsm{active}: state_chg to terminating DMSC msub_fsm{terminating}: Terminating in cascade, depth 2 (cause = OSMO_FSM_TERM_REGULAR, caused by: msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU)) DMSC dummy_msc_i(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){0}: Terminating in cascade, depth 3 (cause = OSMO_FSM_TERM_PARENT, caused by: msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU)) DMSC dummy_msc_i(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){0}: Removing from parent msub_fsm DMSC dummy_msc_i(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){0}: Deferring: will deallocate with msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU) -DMSC msub(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342) Free -DREF VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 - active-conn: now used by 1 (attached) +DMSC msub(IMSI-901700000004620:MSISDN-46071) Free +DREF VLR subscr IMSI-901700000004620:MSISDN-46071 - active-conn: now used by 1 (attached) DMSC msub_fsm{terminating}: Deferring: will deallocate with msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU) DMSC msc_a(IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342:GERAN-A:LU){MSC_A_ST_RELEASED}: Deallocated, including all deferred deallocations - msub gone llist_count(&msub_list) == 0 -DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071:TMSI-0x23422342 (max total use count was 5) +DVLR freeing VLR subscr IMSI-901700000004620:MSISDN-46071 (max total use count was 5) ===== test_lu_unknown_tmsi: SUCCESS -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36453?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I583682d1a35a70b008d7bb2d89ba7c3109a60b21 Gerrit-Change-Number: 36453 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-msc[master]: invalidate vsub->msc_conn_ref when msc_a is discarded

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36451?usp=email ) Change subject: invalidate vsub->msc_conn_ref when msc_a is discarded ...................................................................... invalidate vsub->msc_conn_ref when msc_a is discarded We have an msc_conn_ref pointer from vlr_subscr to an active msc_a instance. So far, we just keep it pointing at discarded memory. Instead, make sure it goes back to NULL when the msc_a instance deallocates. This way the VLR can reliably tell whether a given VLR entry still has an active connection or is just inactively caching the subscriber. Related: SYS#6860 OS#4721 Change-Id: Ic63d01d220b63453976fe06a7c6b606f97172c99 --- M src/libmsc/msc_a.c 1 file changed, 22 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/51/36451/1 diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c index 4fb30c4..70d9bf7 100644 --- a/src/libmsc/msc_a.c +++ b/src/libmsc/msc_a.c @@ -999,6 +999,7 @@ void msc_a_fsm_cleanup(struct osmo_fsm_inst *fi, enum osmo_fsm_term_cause cause) { struct msc_a *msc_a = msc_a_fi_priv(fi); + struct vlr_subscr *vsub = msc_a_vsub(msc_a); trans_conn_closed(msc_a); @@ -1006,6 +1007,10 @@ LOG_MSC_A(msc_a, LOGL_ERROR, "Deallocating active transactions failed\n"); LOG_MSC_A_CAT(msc_a, DREF, LOGL_DEBUG, "max total use count was %d\n", msc_a->max_total_use_count); + + /* Invalidate the active conn in VLR subscriber state, if any. */ + if (vsub && vsub->msc_conn_ref == msc_a) + vsub->msc_conn_ref = NULL; } const struct value_string msc_a_fsm_event_names[] = { -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36451?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ic63d01d220b63453976fe06a7c6b606f97172c99 Gerrit-Change-Number: 36451 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[M] Change in osmo-msc[master]: fix VLR evil twin on LU with unknown TMSI

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email ) Change subject: fix VLR evil twin on LU with unknown TMSI ...................................................................... fix VLR evil twin on LU with unknown TMSI When a subscriber first attaches by TMSI only, and later tells the IMSI via ID Response, it may turn out that this IMSI already exists in the VLR database. If this happens, the TMSI that the subscriber issued was not known in the existing VLR entry, indicating that the subscriber has in the meantime camped on a different core. Which means we can assume that there cannot be any active connections, and the old subscriber can be discarded, for the benefit of the new one. (We could also discard the new one, but it is more complex to reparent the ongoing FSMs for Compl L3 than to copy some dormant VLR state.) In vlr_subscr_set_imsi(), check for an existing IMSI entry in the VLR. If such exists, copy any pending Paging and auth tuple state to the new subscriber, and discard the old one from the VLR. In order to safely discard a vlr subscriber by force, add a new vlr_ops function: subscr_inval(), to tell the MSC that a vlr_subscr is no longer valid. Upcoming patch I583682d1a35a70b008d7bb2d89ba7c3109a60b21 better clears TMSI state from the VLR, making it more likely to hit the evil twin situation this patch fixes; hence this is, sort of, preparation. Related: SYS#6860 OS#4721 Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd --- M include/osmocom/msc/paging.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/paging.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_rest.err 6 files changed, 134 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/52/36452/1 diff --git a/include/osmocom/msc/paging.h b/include/osmocom/msc/paging.h index 4de679d..f8ebf9e 100644 --- a/include/osmocom/msc/paging.h +++ b/include/osmocom/msc/paging.h @@ -40,6 +40,7 @@ struct paging_request *paging_request_start(struct vlr_subscr *vsub, enum paging_cause cause, paging_cb_t paging_cb, struct gsm_trans *trans, const char *label); +void paging_request_join_vsub(struct vlr_subscr *keep_vsub, struct vlr_subscr *discarding_vsub); void paging_request_remove(struct paging_request *pr); void paging_response(struct msc_a *msc_a); diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h index 86a72f2..a7707fd 100644 --- a/include/osmocom/msc/vlr.h +++ b/include/osmocom/msc/vlr.h @@ -257,6 +257,8 @@ /* notify MSC/SGSN that the given subscriber has been associated * with this msc_conn_ref */ int (*subscr_assoc)(void *msc_conn_ref, struct vlr_subscr *vsub); + /* notify MSC that the given subscriber is no longer valid */ + void (*subscr_inval)(void *msc_conn_ref, struct vlr_subscr *vsub); }; /* An instance of the VLR codebase */ diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index 70faf95..17350fa 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -1572,6 +1572,24 @@ return 0; } +static void msc_vlr_subscr_inval(void *msc_conn_ref, struct vlr_subscr *vsub) +{ + /* Search vsub backwards to make sure msc_conn_ref is a valid msc_a instance. */ + struct msub *msub; + OSMO_ASSERT(vsub); + llist_for_each_entry(msub, &msub_list, entry) { + struct msc_a *msc_a; + if (msub->vsub != vsub) + continue; + + msc_a = msub_msc_a(msub); + if (msc_a) + msc_a_release_cn(msc_a); + + msub->vsub = NULL; + } +} + /* operations that we need to implement for libvlr */ const struct vlr_ops msc_vlr_ops = { .tx_auth_req = msc_vlr_tx_auth_req, @@ -1586,6 +1604,7 @@ .tx_mm_info = msc_vlr_tx_mm_info, .subscr_update = msc_vlr_subscr_update, .subscr_assoc = msc_vlr_subscr_assoc, + .subscr_inval = msc_vlr_subscr_inval, }; struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value) diff --git a/src/libmsc/paging.c b/src/libmsc/paging.c index 9845f99..0f139b3 100644 --- a/src/libmsc/paging.c +++ b/src/libmsc/paging.c @@ -120,6 +120,33 @@ return pr; } +/* Two subscribers (e.g. an old TMSI and a new TMSI) turn out to have the same identity, so in order to discard one of + * them, transfer any pending Paging requests to the vsub that will survive. */ +void paging_request_join_vsub(struct vlr_subscr *keep_vsub, struct vlr_subscr *discarding_vsub) +{ + struct paging_request *pr; + + if (!discarding_vsub->cs.is_paging) + return; + + /* transfer all Paging Response callbacks */ + while ((pr = llist_first_entry_or_null(&discarding_vsub->cs.requests, struct paging_request, entry))) { + llist_del(&pr->entry); + talloc_steal(keep_vsub, pr); + llist_add_tail(&pr->entry, &keep_vsub->cs.requests); + } + + /* make sure a Paging use count is present on keep_vsub, if needed */ + if (!keep_vsub->cs.is_paging && !llist_empty(&keep_vsub->cs.requests)) { + vlr_subscr_get(keep_vsub, VSUB_USE_PAGING); + keep_vsub->cs.is_paging = true; + } + + discarding_vsub->cs.is_paging = false; + osmo_timer_del(&discarding_vsub->cs.paging_response_timer); + vlr_subscr_put(discarding_vsub, VSUB_USE_PAGING); +} + void paging_request_remove(struct paging_request *pr) { struct gsm_trans *trans = pr->trans; diff --git a/src/libvlr/vlr.c b/src/libvlr/vlr.c index e2e02bf..05532b1 100644 --- a/src/libvlr/vlr.c +++ b/src/libvlr/vlr.c @@ -36,6 +36,7 @@ #include <osmocom/msc/vlr.h> #include <osmocom/msc/debug.h> #include <osmocom/msc/gsup_client_mux.h> +#include <osmocom/msc/paging.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -272,7 +273,8 @@ llist_for_each_entry(vsub, &vlr->subscribers, list) { if (vlr_subscr_matches_imsi(vsub, imsi)) { - vlr_subscr_get_src(vsub, use, file, line); + if (use) + vlr_subscr_get_src(vsub, use, file, line); return vsub; } } @@ -579,9 +581,57 @@ void vlr_subscr_set_imsi(struct vlr_subscr *vsub, const char *imsi) { + struct vlr_subscr *exists; if (!vsub) return; + /* If the same IMSI is already set, nothing changes. */ + if (!strcmp(vsub->imsi, imsi)) + return; + + /* We've just learned about this new IMSI, our primary key in the VLR. make sure to invalidate any prior VLR + * entries for this IMSI. */ + exists = vlr_subscr_find_by_imsi(vsub->vlr, imsi, NULL); + + if (exists) { + struct vlr_instance *vlr = exists->vlr; + int i; + int j; + LOGP(DVLR, LOGL_NOTICE, + "There is an existing subscriber for IMSI %s used by %s, replacing with new VLR subscr: %s used by %s\n", + imsi, osmo_use_count_to_str_c(OTC_SELECT, &exists->use_count), + vlr_subscr_name(vsub), + osmo_use_count_to_str_c(OTC_SELECT, &vsub->use_count)); + + /* Take over some state from the previous vsub */ + paging_request_join_vsub(vsub, exists); + if (!vsub->msisdn[0]) + OSMO_STRLCPY_ARRAY(vsub->msisdn, exists->msisdn); + if (!vsub->name[0]) + OSMO_STRLCPY_ARRAY(vsub->name, exists->name); + /* Copy valid auth tuples we may already have, to reduce the need to ask for new ones from the HLR */ + for (i = 0; i < ARRAY_SIZE(exists->auth_tuples); i++) { + if (exists->auth_tuples[i].key_seq == VLR_KEY_SEQ_INVAL) + continue; + for (j = 0; j < ARRAY_SIZE(vsub->auth_tuples); j++) { + if (vsub->auth_tuples[j].key_seq != VLR_KEY_SEQ_INVAL) + continue; + vsub->auth_tuples[j] = exists->auth_tuples[i]; + } + } + + if (exists->msc_conn_ref) + LOGVSUBP(LOGL_ERROR, vsub, + "There is an existing VLR entry for this same subscriber with an active connection." + " That should not be possible. Discarding old subscriber entry %s.\n", + exists->imsi); + + if (vlr->ops.subscr_inval) + vlr->ops.subscr_inval(exists->msc_conn_ref, exists); + vlr_subscr_free(exists); + } + + /* Set the IMSI on the new subscriber, here. */ if (OSMO_STRLCPY_ARRAY(vsub->imsi, imsi) >= sizeof(vsub->imsi)) { LOGP(DVLR, LOGL_NOTICE, "IMSI was truncated: full IMSI=%s, truncated IMSI=%s\n", imsi, vsub->imsi); diff --git a/tests/msc_vlr/msc_vlr_test_rest.err b/tests/msc_vlr/msc_vlr_test_rest.err index e649325..fae302f 100644 --- a/tests/msc_vlr/msc_vlr_test_rest.err +++ b/tests/msc_vlr/msc_vlr_test_rest.err @@ -467,7 +467,6 @@ DMM IDENTITY RESPONSE: IMSI-901700000004620 DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_IMSI}: Received Event VLR_ULA_E_ID_IMSI -DVLR set IMSI on subscriber; IMSI=901700000004620 id=901700000004620 DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_IMSI}: vlr_loc_upd_node1_pre() DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_IMSI}: vlr_loc_upd_node1() DVLR vlr_lu_fsm(TMSI-0x23422342:GERAN-A:LU){VLR_ULA_S_WAIT_IMSI}: vlr_loc_upd_post_auth() -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/36452?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ifdabe0b65bffafbf7b8e5cc10e2d225d1ed1cecd Gerrit-Change-Number: 36452 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: cosmetic: TbfTest: fix typo in comment

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36449?usp=email ) Change subject: cosmetic: TbfTest: fix typo in comment ...................................................................... cosmetic: TbfTest: fix typo in comment Change-Id: I35bb28c5669747823b0dfebe27ecd7a5a0c5d60f --- M tests/tbf/TbfTest.cpp 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 0205f2b..643551b 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -2525,7 +2525,7 @@ osmo_fsm_inst_dispatch(ms_dl_tbf(second_ms)->state_fi, TBF_EV_ASSIGN_PCUIF_CNF, NULL); osmo_select_main(0); - /* get the PACCH PktDlAss for the DL-TBF, allocated one the UL-TBF from the new MS obj: */ + /* get the PACCH PktDlAss for the DL-TBF, allocated on the UL-TBF from the new MS obj: */ request_dl_rlc_block(dl_tbf->bts, dl_tbf->control_ts, &fn); fprintf(stderr, "=== end %s ===\n", __func__); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35bb28c5669747823b0dfebe27ecd7a5a0c5d60f Gerrit-Change-Number: 36449 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: cosmetic: TbfTest: fix typo in comment

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36449?usp=email ) Change subject: cosmetic: TbfTest: fix typo in comment ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35bb28c5669747823b0dfebe27ecd7a5a0c5d60f Gerrit-Change-Number: 36449 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 20:11:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[XL] Change in osmo-pcu[master]: Make sure GprsMs free() also frees its tbfs

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/36450?usp=email ) Change subject: Make sure GprsMs free() also frees its tbfs ...................................................................... Make sure GprsMs free() also frees its tbfs This fixes TBF objects leaking and ending up alive when the MS object is explicitly freed through talloc_free (and sporadically crashing TbfTest once a timeout for them occur). This mostly affects unit tests, where most of the explicit free() happens. In osmo-pcu, in general, the GprsMs object only gets _free() called when its resource count reaches 0, aka no more TBFs are attached to it. Hence in general GprsMs object is freed() only when no TBFs (to be leaked) are present. However, in the unit tests it's usual that we want to wipe the entire context by eg. feeing the PCU, the BTS or MS object, which should also free the related TBFs. When running osmo-pcu this may only be an issue when the MS object is freed explicitly, which could happen for instance when a BTS is torn down, ie. PCUIF going down, moment at which all GprsMs of that BTS are freed. But in there actually it iterates over PDCHs to free all TBFs, so it's fine. If we iterated over MS, this could have ended up in a crash, like it happened in TbfTest sporadically, but it's not a bit problem if we crash + restart at that time since anyway the BTS is gone ore just getting up around that time. Related: OS#6359 Change-Id: Ibbdec94acb8132be20508d3178d88da44bfaf91d --- M src/gprs_ms.c M tests/alloc/AllocTest.err M tests/ms/MsTest.cpp M tests/ms/MsTest.err M tests/ms/MsTest.ok M tests/tbf/TbfTest.err M tests/types/TypesTest.err M tests/ulc/PdchUlcTest.err 8 files changed, 4,990 insertions(+), 94 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/50/36450/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36450?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibbdec94acb8132be20508d3178d88da44bfaf91d Gerrit-Change-Number: 36450 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: Force free of tbfs upon GprsMs object free()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36450?usp=email ) Change subject: Force free of tbfs upon GprsMs object free() ...................................................................... Force free of tbfs upon GprsMs object free() Change-Id: Ibbdec94acb8132be20508d3178d88da44bfaf91d --- M src/gprs_ms.c M tests/ms/MsTest.cpp 2 files changed, 20 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/50/36450/1 diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 7fa3fc0..ff7316b 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -193,18 +193,18 @@ osmo_timer_del(&ms->release_timer); if (ms->ul_tbf) { - tbf_set_ms(ul_tbf_as_tbf(ms->ul_tbf), NULL); - ms->ul_tbf = NULL; + tbf_free(ul_tbf_as_tbf(ms->ul_tbf)); + OSMO_ASSERT(ms->ul_tbf == NULL); } if (ms->dl_tbf) { - tbf_set_ms(dl_tbf_as_tbf(ms->dl_tbf), NULL); - ms->dl_tbf = NULL; + tbf_free(dl_tbf_as_tbf(ms->dl_tbf)); + OSMO_ASSERT(ms->dl_tbf == NULL); } llist_for_each_entry_safe(pos, tmp, &ms->old_tbfs, list) { struct gprs_rlcmac_tbf *tbf = (struct gprs_rlcmac_tbf *)pos->entry; - tbf_set_ms(tbf, NULL); + tbf_free(tbf); } llc_queue_clear(&ms->llc_queue, ms->bts); diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp index f051401..5bfbc28 100644 --- a/tests/ms/MsTest.cpp +++ b/tests/ms/MsTest.cpp @@ -443,8 +443,6 @@ dl_tbf = alloc_dl_tbf(bts, ms); ms_attach_tbf(ms, dl_tbf); - ms_unref(ms, __func__); - OSMO_ASSERT(!ms_is_idle(ms)); OSMO_ASSERT(mcs_chan_code(ms_current_cs_dl(ms, ms_mode(ms))) == 3); @@ -453,8 +451,10 @@ OSMO_ASSERT(mcs_chan_code(ms_current_cs_dl(ms, ms_mode(ms))) == 2); - talloc_free(ms); + ms_detach_tbf(ms, dl_tbf); talloc_free(dl_tbf); + ms_unref(ms, __func__); + /* MS has been freed here*/ talloc_free(bts); printf("=== end %s ===\n", __func__); } @@ -513,9 +513,8 @@ ms_set_mode(ms2, EGPRS_GMSK); dump_ms(ms2, "2: after mode set "); - // FIXME: following code triggers ASAN failure: - // ms2->detach_tbf(dl_tbf); - // dump_ms(ms2, "2: after TBF detach "); + ms_detach_tbf(ms2, dl_tbf); + dump_ms(ms2, "2: after TBF detach "); ms_set_mode(ms1, GPRS); dump_ms(ms1, "1: after mode set "); @@ -523,9 +522,9 @@ ms_set_mode(ms2, GPRS); dump_ms(ms2, "2: after mode set "); + talloc_free(dl_tbf); talloc_free(ms1); talloc_free(ms2); - talloc_free(dl_tbf); talloc_free(bts); printf("=== end %s ===\n", __func__); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36450?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ibbdec94acb8132be20508d3178d88da44bfaf91d Gerrit-Change-Number: 36450 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-pcu[master]: cosmetic: TbfTest: fix typo in comment

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/36449?usp=email ) Change subject: cosmetic: TbfTest: fix typo in comment ...................................................................... cosmetic: TbfTest: fix typo in comment Change-Id: I35bb28c5669747823b0dfebe27ecd7a5a0c5d60f --- M tests/tbf/TbfTest.cpp 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/49/36449/1 diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 0205f2b..643551b 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -2525,7 +2525,7 @@ osmo_fsm_inst_dispatch(ms_dl_tbf(second_ms)->state_fi, TBF_EV_ASSIGN_PCUIF_CNF, NULL); osmo_select_main(0); - /* get the PACCH PktDlAss for the DL-TBF, allocated one the UL-TBF from the new MS obj: */ + /* get the PACCH PktDlAss for the DL-TBF, allocated on the UL-TBF from the new MS obj: */ request_dl_rlc_block(dl_tbf->bts, dl_tbf->control_ts, &fn); fprintf(stderr, "=== end %s ===\n", __func__); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/36449?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35bb28c5669747823b0dfebe27ecd7a5a0c5d60f Gerrit-Change-Number: 36449 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: osmo-msc.cfg: move MGW params to 'mgw' node

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36442?usp=email ) Change subject: msc: osmo-msc.cfg: move MGW params to 'mgw' node ...................................................................... msc: osmo-msc.cfg: move MGW params to 'mgw' node This fixes deprecation warnings printed by recent osmo-msc. Change-Id: I724ec44ea37bb61b457361befee3e6e92c886c0d Related: osmo-mgw.git I95f717a0fcd3c4ca622e3989baa28fac1f7ec1ca --- M msc/osmo-msc.cfg 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/msc/osmo-msc.cfg b/msc/osmo-msc.cfg index d05e400..a886565 100644 --- a/msc/osmo-msc.cfg +++ b/msc/osmo-msc.cfg @@ -57,11 +57,12 @@ authentication optional rrlp mode none mm info 0 + mgw 0 + remote-ip 127.0.0.1 msc assign-tmsi cs7-instance-a 0 cs7-instance-iu 0 - mgw remote-ip 127.0.0.1 emergency-call route-to-msisdn 112 mncc external /tmp/mncc.sock mncc-int -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36442?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: I724ec44ea37bb61b457361befee3e6e92c886c0d Gerrit-Change-Number: 36442 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-*-test: set OSMO_SUT_{HOST,PORT} for more testsuites

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36371?usp=email ) Change subject: ttcn3-*-test: set OSMO_SUT_{HOST,PORT} for more testsuites ...................................................................... ttcn3-*-test: set OSMO_SUT_{HOST,PORT} for more testsuites Let's also retrieve talloc reports for these testsuites. Change-Id: Iaa94dd200fdb98962b784cb507c9995096232dc9 --- M ttcn3-cbc-test/jenkins.sh M ttcn3-gbproxy-test-fr/jenkins.sh M ttcn3-gbproxy-test/jenkins.sh M ttcn3-hnbgw-test/jenkins.sh M ttcn3-hnodeb-test/jenkins.sh M ttcn3-mgw-test/jenkins.sh M ttcn3-pcu-test/jenkins-sns.sh M ttcn3-pcu-test/jenkins.sh M ttcn3-sip-test/jenkins.sh M ttcn3-smlc-test/jenkins.sh M ttcn3-stp-test/jenkins.sh M ttcn3-upf-test/jenkins.sh 12 files changed, 35 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/ttcn3-cbc-test/jenkins.sh b/ttcn3-cbc-test/jenkins.sh index e1958ef..6026df0 100755 --- a/ttcn3-cbc-test/jenkins.sh +++ b/ttcn3-cbc-test/jenkins.sh @@ -33,6 +33,8 @@ $(docker_network_params $SUBNET 100) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4264" \ -v $VOL_BASE_DIR/cbc-tester:/data \ --name ${BUILD_TAG}-ttcn3-cbc-test \ $DOCKER_ARGS \ diff --git a/ttcn3-gbproxy-test-fr/jenkins.sh b/ttcn3-gbproxy-test-fr/jenkins.sh index 1c53173..72dc4af 100755 --- a/ttcn3-gbproxy-test-fr/jenkins.sh +++ b/ttcn3-gbproxy-test-fr/jenkins.sh @@ -61,6 +61,8 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_PORT=4246" \ -e "WAIT_FOR_NETDEV=hdlc8" \ -v $VOL_BASE_DIR/gbproxy-tester:/data \ --name ${BUILD_TAG}-ttcn3-gbproxy-test -d \ diff --git a/ttcn3-gbproxy-test/jenkins.sh b/ttcn3-gbproxy-test/jenkins.sh index 0ee7a5f..861be39 100755 --- a/ttcn3-gbproxy-test/jenkins.sh +++ b/ttcn3-gbproxy-test/jenkins.sh @@ -39,6 +39,8 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_PORT=4246" \ -v $VOL_BASE_DIR/gbproxy-tester:/data \ --name ${BUILD_TAG}-ttcn3-gbproxy-test \ $DOCKER_ARGS \ diff --git a/ttcn3-hnbgw-test/jenkins.sh b/ttcn3-hnbgw-test/jenkins.sh index c47c9ca..21647ed 100755 --- a/ttcn3-hnbgw-test/jenkins.sh +++ b/ttcn3-hnbgw-test/jenkins.sh @@ -67,6 +67,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4261" \ -v $base_dir/hnbgw-tester:/data \ -v $base_dir/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-hnbgw-test \ diff --git a/ttcn3-hnodeb-test/jenkins.sh b/ttcn3-hnodeb-test/jenkins.sh index 3b57fd8..cdc47b0 100755 --- a/ttcn3-hnodeb-test/jenkins.sh +++ b/ttcn3-hnodeb-test/jenkins.sh @@ -38,6 +38,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4273" \ -v $VOL_BASE_DIR/hnodeb-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-hnodeb-test \ diff --git a/ttcn3-mgw-test/jenkins.sh b/ttcn3-mgw-test/jenkins.sh index b2d78a7..5395fa3 100755 --- a/ttcn3-mgw-test/jenkins.sh +++ b/ttcn3-mgw-test/jenkins.sh @@ -34,6 +34,8 @@ --ulimit core=-1 \ -v $VOL_BASE_DIR/mgw-tester:/data \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.180" \ + -e "OSMO_SUT_PORT=4243" \ --name ${BUILD_TAG}-ttcn3-mgw-test \ $DOCKER_ARGS \ $REPO_USER/ttcn3-mgw-test diff --git a/ttcn3-pcu-test/jenkins-sns.sh b/ttcn3-pcu-test/jenkins-sns.sh index d63229b..c42ad18 100755 --- a/ttcn3-pcu-test/jenkins-sns.sh +++ b/ttcn3-pcu-test/jenkins-sns.sh @@ -50,6 +50,8 @@ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.101" \ + -e "OSMO_SUT_PORT=4240" \ -v $VOL_BASE_DIR/pcu-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-pcu-test-sns \ diff --git a/ttcn3-pcu-test/jenkins.sh b/ttcn3-pcu-test/jenkins.sh index dca6dc0..f92a08e 100755 --- a/ttcn3-pcu-test/jenkins.sh +++ b/ttcn3-pcu-test/jenkins.sh @@ -46,6 +46,8 @@ $(docker_network_params $SUBNET 10) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.101" \ + -e "OSMO_SUT_PORT=4240" \ -v $VOL_BASE_DIR/pcu-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-pcu-test \ diff --git a/ttcn3-sip-test/jenkins.sh b/ttcn3-sip-test/jenkins.sh index 2a20dcc..5ccbdf5 100755 --- a/ttcn3-sip-test/jenkins.sh +++ b/ttcn3-sip-test/jenkins.sh @@ -39,6 +39,8 @@ $(docker_network_params $SUBNET 103) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.10" \ + -e "OSMO_SUT_PORT=4256" \ -v $VOL_BASE_DIR/sip-tester:/data \ -v $VOL_BASE_DIR/unix:/data/unix \ --name ${BUILD_TAG}-ttcn3-sip-test \ diff --git a/ttcn3-smlc-test/jenkins.sh b/ttcn3-smlc-test/jenkins.sh index 33a1293..ab284b3 100755 --- a/ttcn3-smlc-test/jenkins.sh +++ b/ttcn3-smlc-test/jenkins.sh @@ -47,6 +47,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4271" \ -v $VOL_BASE_DIR/smlc-tester:/data \ --name ${BUILD_TAG}-ttcn3-smlc-test \ $DOCKER_ARGS \ diff --git a/ttcn3-stp-test/jenkins.sh b/ttcn3-stp-test/jenkins.sh index f6768f0..4f90a4d 100755 --- a/ttcn3-stp-test/jenkins.sh +++ b/ttcn3-stp-test/jenkins.sh @@ -40,6 +40,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.200" \ + -e "OSMO_SUT_PORT=4239" \ -v $VOL_BASE_DIR/stp-tester:/data \ --name ${BUILD_TAG}-ttcn3-stp-test \ $DOCKER_ARGS \ diff --git a/ttcn3-upf-test/jenkins.sh b/ttcn3-upf-test/jenkins.sh index f814975..8bb19e2 100755 --- a/ttcn3-upf-test/jenkins.sh +++ b/ttcn3-upf-test/jenkins.sh @@ -33,6 +33,8 @@ $(docker_network_params $SUBNET 203) \ --ulimit core=-1 \ -e "TTCN3_PCAP_PATH=/data" \ + -e "OSMO_SUT_HOST=172.18.$SUBNET.20" \ + -e "OSMO_SUT_PORT=4275" \ -v $VOL_BASE_DIR/upf-tester:/data \ --name ${BUILD_TAG}-ttcn3-upf-test \ $DOCKER_ARGS \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36371?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iaa94dd200fdb98962b784cb507c9995096232dc9 Gerrit-Change-Number: 36371 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 4 weeks

1
0
0 0

[S] Change in simtrace2[master]: cardemu: add support for inverted sim presence pins

by mschramm

Attention is currently required from: lynxis lazus. mschramm has removed a vote from this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36441?usp=email ) Change subject: cardemu: add support for inverted sim presence pins ...................................................................... Removed Code-Review+2 by mschramm <mschramm(a)sysmocom.de> -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I33325f763b56b297762a3fb6fe6baa7b0354de3c Gerrit-Change-Number: 36441 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: mschramm <mschramm(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: deleteVote

2 months, 4 weeks

1
0
0 0

[S] Change in simtrace2[master]: cardemu: add support for inverted sim presence pins

by mschramm

Attention is currently required from: lynxis lazus. mschramm has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36441?usp=email ) Change subject: cardemu: add support for inverted sim presence pins ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I33325f763b56b297762a3fb6fe6baa7b0354de3c Gerrit-Change-Number: 36441 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: mschramm <mschramm(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Mar 2024 17:25:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[M] Change in osmo-hnbgw[master]: context_map_{rua,sccp}: Re-order to always process KPIs

by osmith

Attention is currently required from: dexter, fixeria, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36312?usp=email ) Change subject: context_map_{rua,sccp}: Re-order to always process KPIs ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36312?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6054b6efcc202ebd71cd6e135e49c279ba616a01 Gerrit-Change-Number: 36312 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 16:10:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in simtrace2[master]: cardemu: add support for inverted sim presence pins

by osmith

Attention is currently required from: lynxis lazus. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/36441?usp=email ) Change subject: cardemu: add support for inverted sim presence pins ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/36441?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I33325f763b56b297762a3fb6fe6baa7b0354de3c Gerrit-Change-Number: 36441 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: mschramm <mschramm(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Mon, 25 Mar 2024 16:08:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-*-test: set OSMO_SUT_{HOST,PORT} for more testsuites

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36371?usp=email ) Change subject: ttcn3-*-test: set OSMO_SUT_{HOST,PORT} for more testsuites ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36371?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Iaa94dd200fdb98962b784cb507c9995096232dc9 Gerrit-Change-Number: 36371 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 16:05:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: msc: osmo-msc.cfg: move MGW params to 'mgw' node

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36442?usp=email ) Change subject: msc: osmo-msc.cfg: move MGW params to 'mgw' node ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/36442?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: I724ec44ea37bb61b457361befee3e6e92c886c0d Gerrit-Change-Number: 36442 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 16:03:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[XL] Change in osmo-cbc[master]: SBcAP: Update as1nc skeleton and generated code

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/36448?usp=email ) Change subject: SBcAP: Update as1nc skeleton and generated code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/36448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0153ecf307c99ce904ed4632422bd9d586ec3167 Gerrit-Change-Number: 36448 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 16:02:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[XL] Change in osmo-cbc[master]: SBcAP: Update as1nc skeleton and generated code

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/36448?usp=email ) Change subject: SBcAP: Update as1nc skeleton and generated code ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I verified ttcn3-cbc-test still passes as good as before this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/36448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0153ecf307c99ce904ed4632422bd9d586ec3167 Gerrit-Change-Number: 36448 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Mar 2024 15:26:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[XL] Change in osmo-cbc[master]: SBcAP: Update as1nc skeleton and generated code

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/36448?usp=email ) Change subject: SBcAP: Update as1nc skeleton and generated code ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I'm submitting this since I anyway had to try rebuilding with newer asn1c as requested by upstream in https://github.com/mouse07410/asn1c/issues/102 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/36448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0153ecf307c99ce904ed4632422bd9d586ec3167 Gerrit-Change-Number: 36448 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 25 Mar 2024 15:11:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[XL] Change in osmo-cbc[master]: SBcAP: Update as1nc skeleton and generated code

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/36448?usp=email ) Change subject: SBcAP: Update as1nc skeleton and generated code ...................................................................... SBcAP: Update as1nc skeleton and generated code Generated using current mouse07410/vlm_master (12b8e555b971c745ea715cb247f39120fa15f7f0) [1] [1] https://github.com/mouse07410/asn1c/commit/12b8e555b971c745ea715cb247f39120… Change-Id: I0153ecf307c99ce904ed4632422bd9d586ec3167 --- M src/sbcap/Makefile.am M src/sbcap/gen/ANY.c M src/sbcap/gen/BIT_STRING.c A src/sbcap/gen/ENUMERATED.c A src/sbcap/gen/ENUMERATED_aper.c M src/sbcap/gen/GraphicString.c M src/sbcap/gen/INTEGER.c M src/sbcap/gen/INTEGER_aper.c M src/sbcap/gen/NativeEnumerated.c M src/sbcap/gen/NativeEnumerated_aper.c M src/sbcap/gen/NativeInteger.c M src/sbcap/gen/NativeInteger_rfill.c M src/sbcap/gen/OBJECT_IDENTIFIER.c M src/sbcap/gen/OCTET_STRING.c M src/sbcap/gen/OCTET_STRING_aper.c M src/sbcap/gen/OPEN_TYPE.c M src/sbcap/gen/OPEN_TYPE_aper.c M src/sbcap/gen/ObjectDescriptor.c M src/sbcap/gen/aper_support.c M src/sbcap/gen/asn_application.c M src/sbcap/gen/asn_internal.c M src/sbcap/gen/asn_random_fill.c M src/sbcap/gen/constr_CHOICE.c M src/sbcap/gen/constr_CHOICE_aper.c M src/sbcap/gen/constr_SEQUENCE.c M src/sbcap/gen/constr_SEQUENCE_OF.c M src/sbcap/gen/constr_SET_OF.c M src/sbcap/gen/constr_SET_OF_aper.c M src/sbcap/gen/constr_TYPE.c M src/sbcap/skel/ANY.h M src/sbcap/skel/BIT_STRING.h M src/sbcap/skel/BMPString.h M src/sbcap/skel/BOOLEAN.h M src/sbcap/skel/ENUMERATED.h M src/sbcap/skel/GeneralString.h M src/sbcap/skel/GeneralizedTime.h M src/sbcap/skel/GraphicString.h M src/sbcap/skel/IA5String.h M src/sbcap/skel/INTEGER.h M src/sbcap/skel/ISO646String.h M src/sbcap/skel/NULL.h M src/sbcap/skel/NativeEnumerated.h M src/sbcap/skel/NativeInteger.h M src/sbcap/skel/NativeReal.h M src/sbcap/skel/NumericString.h M src/sbcap/skel/OBJECT_IDENTIFIER.h M src/sbcap/skel/OCTET_STRING.h M src/sbcap/skel/OPEN_TYPE.h M src/sbcap/skel/ObjectDescriptor.h M src/sbcap/skel/PrintableString.h M src/sbcap/skel/REAL.h M src/sbcap/skel/RELATIVE-OID.h M src/sbcap/skel/T61String.h M src/sbcap/skel/TeletexString.h M src/sbcap/skel/UTCTime.h M src/sbcap/skel/UTF8String.h M src/sbcap/skel/UniversalString.h M src/sbcap/skel/VideotexString.h M src/sbcap/skel/VisibleString.h M src/sbcap/skel/aper_support.h M src/sbcap/skel/asn_application.h M src/sbcap/skel/asn_codecs_prim.h M src/sbcap/skel/asn_system.h M src/sbcap/skel/constr_CHOICE.h M src/sbcap/skel/constr_SEQUENCE.h M src/sbcap/skel/constr_SEQUENCE_OF.h M src/sbcap/skel/constr_SET.h M src/sbcap/skel/constr_SET_OF.h M src/sbcap/skel/constr_TYPE.h A src/sbcap/skel/jer_decoder.h M src/sbcap/skel/jer_encoder.h A src/sbcap/skel/jer_support.h 72 files changed, 1,166 insertions(+), 160 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/48/36448/1 diff --git a/src/sbcap/Makefile.am b/src/sbcap/Makefile.am index b8cb5c8..0a4c471 100644 --- a/src/sbcap/Makefile.am +++ b/src/sbcap/Makefile.am @@ -33,6 +33,8 @@ gen/constr_SET_OF_print.c \ gen/constr_SET_OF_rfill.c \ gen/constr_TYPE.c \ + gen/ENUMERATED.c \ + gen/ENUMERATED_aper.c \ gen/GraphicString.c \ gen/INTEGER_aper.c \ gen/INTEGER.c \ @@ -348,7 +350,9 @@ skel/constr_TYPE.h \ skel/constraints.h \ skel/der_encoder.h \ + skel/jer_decoder.h \ skel/jer_encoder.h \ + skel/jer_support.h \ skel/oer_decoder.h \ skel/oer_encoder.h \ skel/oer_support.h \ diff --git a/src/sbcap/gen/ANY.c b/src/sbcap/gen/ANY.c index bf988db..3cbe1e2 100644 --- a/src/sbcap/gen/ANY.c +++ b/src/sbcap/gen/ANY.c @@ -18,6 +18,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ OCTET_STRING_compare, + OCTET_STRING_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) OCTET_STRING_decode_ber, OCTET_STRING_encode_der, @@ -33,9 +34,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + OCTET_STRING_decode_jer_hex, ANY_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) 0, diff --git a/src/sbcap/gen/BIT_STRING.c b/src/sbcap/gen/BIT_STRING.c index b5ba940..208ac14 100644 --- a/src/sbcap/gen/BIT_STRING.c +++ b/src/sbcap/gen/BIT_STRING.c @@ -24,6 +24,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ BIT_STRING_compare, + BIT_STRING_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, /* Implemented in terms of OCTET STRING */ @@ -39,9 +40,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + OCTET_STRING_decode_jer_hex, BIT_STRING_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) BIT_STRING_decode_oer, @@ -211,3 +214,37 @@ return 1; } } + +int +BIT_STRING_copy(const asn_TYPE_descriptor_t *td, void **aptr, + const void *bptr) { + const asn_OCTET_STRING_specifics_t *specs = td->specifics; + BIT_STRING_t *a = (BIT_STRING_t *)*aptr; + const BIT_STRING_t *b = (const BIT_STRING_t *)bptr; + + if(!b) { + if(a) { + FREEMEM(a->buf); + FREEMEM(a); + *aptr = 0; + } + return 0; + } + + if(!a) { + a = *aptr = CALLOC(1, specs->struct_size); + if(!a) return -1; + } + + uint8_t* buf = MALLOC(b->size + 1); + if(!buf) return -1; + memcpy(buf, b->buf, b->size); + buf[b->size] = 0; + + FREEMEM(a->buf); + a->buf = buf; + a->size = b->size; + a->bits_unused = b->bits_unused; + + return 0; +} diff --git a/src/sbcap/gen/ENUMERATED.c b/src/sbcap/gen/ENUMERATED.c new file mode 100644 index 0000000..97bc9b1 --- /dev/null +++ b/src/sbcap/gen/ENUMERATED.c @@ -0,0 +1,92 @@ +/*- + * Copyright (c) 2003, 2005, 2006 Lev Walkin <vlm(a)lionet.info>. + * All rights reserved. + * Redistribution and modifications are permitted subject to BSD license. + */ +#include <asn_internal.h> +#include <ENUMERATED.h> + +/* + * ENUMERATED basic type description. + */ +static const ber_tlv_tag_t asn_DEF_ENUMERATED_tags[] = { + (ASN_TAG_CLASS_UNIVERSAL | (10 << 2)) +}; +asn_TYPE_operation_t asn_OP_ENUMERATED = { + ASN__PRIMITIVE_TYPE_free, +#if !defined(ASN_DISABLE_PRINT_SUPPORT) + INTEGER_print, /* Implemented in terms of INTEGER */ +#else + 0, +#endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ + INTEGER_compare, /* Implemented in terms of INTEGER */ + INTEGER_copy, /* Implemented in terms of INTEGER */ +#if !defined(ASN_DISABLE_BER_SUPPORT) + ber_decode_primitive, + INTEGER_encode_der, /* Implemented in terms of INTEGER */ +#else + 0, + 0, +#endif /* !defined(ASN_DISABLE_BER_SUPPORT) */ +#if !defined(ASN_DISABLE_XER_SUPPORT) + INTEGER_decode_xer, /* This is temporary! */ + INTEGER_encode_xer, +#else + 0, + 0, +#endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + ENUMERATED_decode_jer, + INTEGER_encode_jer, +#else + 0, + 0, +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ +#if !defined(ASN_DISABLE_OER_SUPPORT) + ENUMERATED_decode_oer, + ENUMERATED_encode_oer, +#else + 0, + 0, +#endif /* !defined(ASN_DISABLE_OER_SUPPORT) */ +#if !defined(ASN_DISABLE_UPER_SUPPORT) + ENUMERATED_decode_uper, /* Unaligned PER decoder */ + ENUMERATED_encode_uper, /* Unaligned PER encoder */ +#else + 0, + 0, +#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) */ +#if !defined(ASN_DISABLE_APER_SUPPORT) + ENUMERATED_decode_aper, /* Aligned PER decoder */ + ENUMERATED_encode_aper, /* Aligned PER encoder */ +#else + 0, + 0, +#endif /* !defined(ASN_DISABLE_APER_SUPPORT) */ +#if !defined(ASN_DISABLE_RFILL_SUPPORT) + ENUMERATED_random_fill, +#else + 0, +#endif /* !defined(ASN_DISABLE_RFILL_SUPPORT) */ + 0 /* Use generic outmost tag fetcher */ +}; +asn_TYPE_descriptor_t asn_DEF_ENUMERATED = { + "ENUMERATED", + "ENUMERATED", + &asn_OP_ENUMERATED, + asn_DEF_ENUMERATED_tags, + sizeof(asn_DEF_ENUMERATED_tags) / sizeof(asn_DEF_ENUMERATED_tags[0]), + asn_DEF_ENUMERATED_tags, /* Same as above */ + sizeof(asn_DEF_ENUMERATED_tags) / sizeof(asn_DEF_ENUMERATED_tags[0]), + { +#if !defined(ASN_DISABLE_OER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_OER_SUPPORT) */ +#if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) + 0, +#endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ + asn_generic_no_constraint + }, + 0, 0, /* No members */ + 0 /* No specifics */ +}; diff --git a/src/sbcap/gen/ENUMERATED_aper.c b/src/sbcap/gen/ENUMERATED_aper.c new file mode 100644 index 0000000..58911a4 --- /dev/null +++ b/src/sbcap/gen/ENUMERATED_aper.c @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2017 Lev Walkin <vlm(a)lionet.info>. + * All rights reserved. + * Redistribution and modifications are permitted subject to BSD license. + */ +#include <asn_internal.h> +#include <ENUMERATED.h> +#include <NativeEnumerated.h> + +asn_dec_rval_t +ENUMERATED_decode_aper(const asn_codec_ctx_t *opt_codec_ctx, + const asn_TYPE_descriptor_t *td, + const asn_per_constraints_t *constraints, void **sptr, asn_per_data_t *pd) { + asn_dec_rval_t rval; + ENUMERATED_t *st = (ENUMERATED_t *)*sptr; + long value; + void *vptr = &value; + + if(!st) { + st = (ENUMERATED_t *)(*sptr = CALLOC(1, sizeof(*st))); + if(!st) ASN__DECODE_FAILED; + } + + rval = NativeEnumerated_decode_aper(opt_codec_ctx, td, constraints, + (void **)&vptr, pd); + if(rval.code == RC_OK) + if(asn_long2INTEGER(st, value)) + rval.code = RC_FAIL; + return rval; +} + +asn_enc_rval_t +ENUMERATED_encode_aper(const asn_TYPE_descriptor_t *td, + const asn_per_constraints_t *constraints, + const void *sptr, asn_per_outp_t *po) { + const ENUMERATED_t *st = (const ENUMERATED_t *)sptr; + long value; + + if(asn_INTEGER2long(st, &value)) + ASN__ENCODE_FAILED; + + return NativeEnumerated_encode_aper(td, constraints, &value, po); +} diff --git a/src/sbcap/gen/GraphicString.c b/src/sbcap/gen/GraphicString.c index b761187..0f2fc39 100644 --- a/src/sbcap/gen/GraphicString.c +++ b/src/sbcap/gen/GraphicString.c @@ -20,6 +20,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ OCTET_STRING_compare, + OCTET_STRING_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, @@ -35,9 +36,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + OCTET_STRING_decode_jer_hex, OCTET_STRING_encode_jer, /* Can't expect it to be ASCII/UTF8 */ #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) OCTET_STRING_decode_oer, diff --git a/src/sbcap/gen/INTEGER.c b/src/sbcap/gen/INTEGER.c index 095063f..df2f529 100644 --- a/src/sbcap/gen/INTEGER.c +++ b/src/sbcap/gen/INTEGER.c @@ -22,6 +22,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ INTEGER_compare, + INTEGER_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) ber_decode_primitive, INTEGER_encode_der, @@ -37,9 +38,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + INTEGER_decode_jer, INTEGER_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) INTEGER_decode_oer, /* OER decoder */ @@ -361,7 +364,8 @@ break; } /* Copy the integer body */ - for(bp = buf, pend1 += add; p != pend1; p += add) + pend1 += add; + for(bp = buf; p != pend1; p += add) *bp++ = *p; if(st->buf) FREEMEM(st->buf); @@ -411,6 +415,33 @@ return asn_imax2INTEGER(st, value); } +int asn_INTEGER2int64(const INTEGER_t *st, int64_t *value) { + intmax_t v; + if(asn_INTEGER2imax(st, &v) == 0) { + if(v < INT64_MIN || v > INT64_MAX) { + errno = ERANGE; + return -1; + } + *value = v; + return 0; + } else { + return -1; + } +} + +int asn_INTEGER2uint64(const INTEGER_t *st, uint64_t *value) { + uintmax_t v; + if(asn_INTEGER2umax(st, &v) == 0) { + if(v > UINT64_MAX) { + errno = ERANGE; + return -1; + } + *value = v; + return 0; + } else { + return -1; + } +} int asn_uint642INTEGER(INTEGER_t *st, uint64_t value) { @@ -736,3 +767,40 @@ } } + +int +INTEGER_copy(const asn_TYPE_descriptor_t *td, void **aptr, + const void *bptr) { + (void)td; + INTEGER_t *a = *aptr; + const INTEGER_t *b = bptr; + + if(!b) { + if(a) { + FREEMEM(a->buf); + FREEMEM(a); + *aptr = 0; + } + return 0; + } + + if(!a) { + a = *aptr = CALLOC(1, sizeof(*a)); + if(!a) return -1; + } + + if(b->size) { + uint8_t* buf = MALLOC(b->size); + if(!buf) return -1; + memcpy(buf, b->buf, b->size); + FREEMEM(a->buf); + a->buf = buf; + a->size = b->size; + } else { + FREEMEM(a->buf); + a->buf = 0; + a->size = 0; + } + + return 0; +} diff --git a/src/sbcap/gen/INTEGER_aper.c b/src/sbcap/gen/INTEGER_aper.c index fc88268..2bfa96f 100644 --- a/src/sbcap/gen/INTEGER_aper.c +++ b/src/sbcap/gen/INTEGER_aper.c @@ -57,7 +57,7 @@ int max_range_bytes = (ct->range_bits >> 3) + (((ct->range_bits % 8) > 0) ? 1 : 0); int length = 0, i; - long value = 0; + intmax_t value = 0; for (i = 1; ; i++) { int upper = 1 << i; @@ -79,18 +79,18 @@ int buf = per_get_few_bits(pd, 8); if (buf < 0) ASN__DECODE_FAILED; - value += (((long)buf) << (8 * length)); + value += (((intmax_t)buf) << (8 * length)); } value += ct->lower_bound; if((specs && specs->field_unsigned) - ? asn_uint642INTEGER(st, (unsigned long)value) - : asn_int642INTEGER(st, value)) + ? asn_umax2INTEGER(st, (uintmax_t)value) + : asn_imax2INTEGER(st, value)) ASN__DECODE_FAILED; - ASN_DEBUG("Got value %ld + low %lld", - value, (long long int)ct->lower_bound); + ASN_DEBUG("Got value %"ASN_PRIdMAX" + low %"ASN_PRIdMAX"", + value, (intmax_t)ct->lower_bound); } else { - long value = 0; + intmax_t value = 0; if (ct->range_bits < 8) { value = per_get_few_bits(pd, ct->range_bits); if(value < 0) ASN__DECODE_STARVED; @@ -108,11 +108,11 @@ } value += ct->lower_bound; if((specs && specs->field_unsigned) - ? asn_ulong2INTEGER(st, value) - : asn_long2INTEGER(st, value)) + ? asn_umax2INTEGER(st, (uintmax_t)value) + : asn_imax2INTEGER(st, value)) ASN__DECODE_FAILED; - ASN_DEBUG("Got value %ld + low %lld", - value, (long long int)ct->lower_bound); + ASN_DEBUG("Got value %"ASN_PRIdMAX" + low %"ASN_PRIdMAX"", + value, (intmax_t)ct->lower_bound); } return rval; } else { @@ -167,7 +167,7 @@ const uint8_t *buf; const uint8_t *end; const asn_per_constraint_t *ct; - long value = 0; + intmax_t value = 0; if(!st || st->size == 0) ASN__ENCODE_FAILED; @@ -179,26 +179,26 @@ if(ct) { int inext = 0; if(specs && specs->field_unsigned) { - unsigned long uval; - if(asn_INTEGER2ulong(st, &uval)) + uintmax_t uval; + if(asn_INTEGER2umax(st, &uval)) ASN__ENCODE_FAILED; /* Check proper range */ if(ct->flags & APC_SEMI_CONSTRAINED) { - if(uval < (unsigned long)ct->lower_bound) + if(uval < (uintmax_t)ct->lower_bound) inext = 1; } else if(ct->range_bits >= 0) { - if(uval < (unsigned long)ct->lower_bound - || uval > (unsigned long)ct->upper_bound) + if(uval < (uintmax_t)ct->lower_bound + || uval > (uintmax_t)ct->upper_bound) inext = 1; } - ASN_DEBUG("Value %lu (%02x/%zu) lb %lld ub %lld %s", + ASN_DEBUG("Value %"ASN_PRIdMAX" (%02x/%"ASN_PRI_SIZE") lb %"ASN_PRIdMAX" ub %"ASN_PRIdMAX" %s", uval, st->buf[0], st->size, - (long long int)ct->lower_bound, - (long long int)ct->upper_bound, + (intmax_t)ct->lower_bound, + (intmax_t)ct->upper_bound, inext ? "ext" : "fix"); value = uval; } else { - if(asn_INTEGER2long(st, &value)) ASN__ENCODE_FAILED; + if(asn_INTEGER2imax(st, &value)) ASN__ENCODE_FAILED; /* Check proper range */ if(ct->flags & APC_SEMI_CONSTRAINED) { if(value < ct->lower_bound) @@ -208,10 +208,10 @@ || value > ct->upper_bound) inext = 1; } - ASN_DEBUG("Value %lu (%02x/%zu) lb %lld ub %lld %s", + ASN_DEBUG("Value %"ASN_PRIdMAX" (%02x/%"ASN_PRI_SIZE") lb %"ASN_PRIdMAX" ub %"ASN_PRIdMAX" %s", value, st->buf[0], st->size, - (long long int)ct->lower_bound, - (long long int)ct->upper_bound, + (intmax_t)ct->lower_bound, + (intmax_t)ct->upper_bound, inext ? "ext" : "fix"); } if(ct->flags & APC_EXTENSIBLE) { @@ -225,11 +225,11 @@ /* X.691, #12.2.2 */ if(ct && ct->range_bits >= 0) { - unsigned long v; + uintmax_t v; /* #10.5.6 */ - ASN_DEBUG("Encoding integer %ld (%lld) with range %d bits", - value, (long long int)(value - ct->lower_bound), + ASN_DEBUG("Encoding integer %"ASN_PRIdMAX" (%"ASN_PRIdMAX") with range %d bits", + value, (intmax_t)(value - ct->lower_bound), ct->range_bits); v = value - ct->lower_bound; @@ -287,7 +287,7 @@ } if(ct && ct->lower_bound) { - ASN_DEBUG("Adjust lower bound to %lld", (long long int)ct->lower_bound); + ASN_DEBUG("Adjust lower bound to %"ASN_PRIdMAX"", (intmax_t)ct->lower_bound); /* TODO: adjust lower bound */ ASN__ENCODE_FAILED; } diff --git a/src/sbcap/gen/NativeEnumerated.c b/src/sbcap/gen/NativeEnumerated.c index aee450c..148cb8f 100644 --- a/src/sbcap/gen/NativeEnumerated.c +++ b/src/sbcap/gen/NativeEnumerated.c @@ -26,6 +26,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ NativeInteger_compare, + NativeInteger_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) NativeInteger_decode_ber, NativeInteger_encode_der, @@ -41,9 +42,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + NativeEnumerated_decode_jer, NativeEnumerated_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) NativeEnumerated_decode_oer, diff --git a/src/sbcap/gen/NativeEnumerated_aper.c b/src/sbcap/gen/NativeEnumerated_aper.c index 5c4c256..bd205b1 100644 --- a/src/sbcap/gen/NativeEnumerated_aper.c +++ b/src/sbcap/gen/NativeEnumerated_aper.c @@ -64,7 +64,7 @@ */ /* XXX handle indefinite index length > 64k */ - value = aper_get_nsnnwn(pd, 65537); + value = aper_get_nsnnwn(pd); if(value < 0) ASN__DECODE_STARVED; value += specs->extension - 1; //if(value >= specs->map_count) @@ -148,9 +148,7 @@ ASN_DEBUG("value = %ld, ext = %d, inext = %d, res = %ld", value, specs->extension, inext, value - (inext ? (specs->extension - 1) : 0)); - if(aper_put_nsnnwn(po, - ct->upper_bound - ct->lower_bound + 1, - value - (inext ? (specs->extension - 1) : 0))) + if(aper_put_nsnnwn(po, value - (inext ? (specs->extension - 1) : 0))) ASN__ENCODE_FAILED; ASN__ENCODED_OK(er); diff --git a/src/sbcap/gen/NativeInteger.c b/src/sbcap/gen/NativeInteger.c index f0309b0..8957b65 100644 --- a/src/sbcap/gen/NativeInteger.c +++ b/src/sbcap/gen/NativeInteger.c @@ -27,6 +27,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ NativeInteger_compare, + NativeInteger_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) NativeInteger_decode_ber, NativeInteger_encode_der, @@ -42,9 +43,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + NativeInteger_decode_jer, NativeInteger_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) NativeInteger_decode_oer, /* OER decoder */ @@ -150,3 +153,30 @@ return 1; } } + +int +NativeInteger_copy(const asn_TYPE_descriptor_t *td, void **aptr, const void *bptr) { + unsigned long *a = *aptr; + const unsigned long *b = bptr; + + (void)td; + + /* Check if source has data */ + if(!b) { + /* Clear destination */ + if(a) { + FREEMEM(a); + *aptr = 0; + } + return 0; + } + + if(!a) { + a = *aptr = MALLOC(sizeof(*a)); + if(!a) return -1; + } + + *a = *b; + + return 0; +} diff --git a/src/sbcap/gen/NativeInteger_rfill.c b/src/sbcap/gen/NativeInteger_rfill.c index 0e2cee8..fddd149 100644 --- a/src/sbcap/gen/NativeInteger_rfill.c +++ b/src/sbcap/gen/NativeInteger_rfill.c @@ -63,8 +63,10 @@ 0, sizeof(variants) / sizeof(variants[0]) - 1)]; } - if(!constraints) constraints = &td->encoding_constraints; #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) + if(!constraints || !constraints->per_constraints) + constraints = &td->encoding_constraints; + const asn_per_constraints_t *ct; ct = constraints ? constraints->per_constraints : 0; @@ -74,6 +76,8 @@ ct->value.upper_bound); } } +#else + if(!constraints) constraints = &td->encoding_constraints; #endif /* !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) */ } diff --git a/src/sbcap/gen/OBJECT_IDENTIFIER.c b/src/sbcap/gen/OBJECT_IDENTIFIER.c index 5cf2d60..c5ab38e 100644 --- a/src/sbcap/gen/OBJECT_IDENTIFIER.c +++ b/src/sbcap/gen/OBJECT_IDENTIFIER.c @@ -24,6 +24,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ OCTET_STRING_compare, /* Implemented in terms of a string comparison */ + OCTET_STRING_copy, /* Implemented in terms of a string copy */ #if !defined(ASN_DISABLE_BER_SUPPORT) ber_decode_primitive, der_encode_primitive, @@ -39,9 +40,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + OBJECT_IDENTIFIER_decode_jer, OBJECT_IDENTIFIER_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) OBJECT_IDENTIFIER_decode_oer, diff --git a/src/sbcap/gen/OCTET_STRING.c b/src/sbcap/gen/OCTET_STRING.c index d0bdead..fc983b4 100644 --- a/src/sbcap/gen/OCTET_STRING.c +++ b/src/sbcap/gen/OCTET_STRING.c @@ -26,6 +26,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ OCTET_STRING_compare, + OCTET_STRING_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) OCTET_STRING_decode_ber, OCTET_STRING_encode_der, @@ -41,9 +42,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + OCTET_STRING_decode_jer_hex, OCTET_STRING_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) OCTET_STRING_decode_oer, @@ -247,6 +250,43 @@ } +int +OCTET_STRING_copy(const asn_TYPE_descriptor_t *td, void **aptr, + const void *bptr) { + const asn_OCTET_STRING_specifics_t *specs = + td->specifics ? (const asn_OCTET_STRING_specifics_t *)td->specifics + : &asn_SPC_OCTET_STRING_specs; + OCTET_STRING_t *a = *aptr; + const OCTET_STRING_t *b = bptr; + + if(!b) { + if(a) { + FREEMEM(a->buf); + a->buf = 0; + a->size = 0; + FREEMEM(a); + } + *aptr = 0; + return 0; + } + + if(!a) { + a = *aptr = (OCTET_STRING_t *)CALLOC(1, specs->struct_size); + if(!a) return -1; + } + + void *buf = MALLOC(b->size + 1); + if(!buf) return -1; + memcpy(buf, b->buf, b->size); + ((uint8_t *)buf)[b->size] = '\0'; + + FREEMEM(a->buf); + a->buf = (uint8_t *)buf; + a->size = b->size; + + return 0; +} + #if !defined(ASN_DISABLE_UPER_SUPPORT) || !defined(ASN_DISABLE_APER_SUPPORT) int OCTET_STRING_per_get_characters(asn_per_data_t *po, uint8_t *buf, diff --git a/src/sbcap/gen/OCTET_STRING_aper.c b/src/sbcap/gen/OCTET_STRING_aper.c index 0373fe6..2601383 100644 --- a/src/sbcap/gen/OCTET_STRING_aper.c +++ b/src/sbcap/gen/OCTET_STRING_aper.c @@ -179,7 +179,6 @@ raw_len = aper_get_length(pd, csiz->lower_bound, csiz->upper_bound, csiz->effective_bits, &repeat); if(raw_len < 0) RETURN(RC_WMORE); - raw_len += csiz->lower_bound; ASN_DEBUG("Got PER length eb %ld, len %ld, %s (%s)", (long)csiz->effective_bits, (long)raw_len, diff --git a/src/sbcap/gen/OPEN_TYPE.c b/src/sbcap/gen/OPEN_TYPE.c index c9afecf..75f9b95 100644 --- a/src/sbcap/gen/OPEN_TYPE.c +++ b/src/sbcap/gen/OPEN_TYPE.c @@ -14,6 +14,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ OPEN_TYPE_compare, + OPEN_TYPE_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) OPEN_TYPE_decode_ber, OPEN_TYPE_encode_der, @@ -29,9 +30,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + OPEN_TYPE_decode_jer, OPEN_TYPE_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) OPEN_TYPE_decode_oer, diff --git a/src/sbcap/gen/OPEN_TYPE_aper.c b/src/sbcap/gen/OPEN_TYPE_aper.c index 3e2ab18..78799ff 100644 --- a/src/sbcap/gen/OPEN_TYPE_aper.c +++ b/src/sbcap/gen/OPEN_TYPE_aper.c @@ -53,7 +53,8 @@ (char *)*memb_ptr2 + elm->type->elements[selected.presence_index - 1].memb_offset; - rv = aper_open_type_get(opt_codec_ctx, selected.type_descriptor, NULL, + rv = aper_open_type_get(opt_codec_ctx, selected.type_descriptor, + elm->type->elements[selected.presence_index - 1].encoding_constraints.per_constraints, &inner_value, pd); switch(rv.code) { case RC_OK: @@ -110,7 +111,7 @@ memb_ptr = (const char *)sptr + elm->memb_offset; } - if(aper_open_type_put(elm->type, NULL, memb_ptr, po) < 0) { + if(aper_open_type_put(elm->type, elm->encoding_constraints.per_constraints, memb_ptr, po) < 0) { ASN__ENCODE_FAILED; } diff --git a/src/sbcap/gen/ObjectDescriptor.c b/src/sbcap/gen/ObjectDescriptor.c index c311a92..4b3560a 100644 --- a/src/sbcap/gen/ObjectDescriptor.c +++ b/src/sbcap/gen/ObjectDescriptor.c @@ -20,6 +20,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ OCTET_STRING_compare, + OCTET_STRING_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) OCTET_STRING_decode_ber, /* Implemented in terms of OCTET STRING */ OCTET_STRING_encode_der, @@ -35,9 +36,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + OCTET_STRING_decode_jer_utf8, OCTET_STRING_encode_jer_utf8, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) 0, diff --git a/src/sbcap/gen/aper_support.c b/src/sbcap/gen/aper_support.c index 1f34c60..6731c1c 100644 --- a/src/sbcap/gen/aper_support.c +++ b/src/sbcap/gen/aper_support.c @@ -25,8 +25,7 @@ *repeat = 0; if (constrained && ub < 65536) { - int range = ub - lb + 1; - return aper_get_nsnnwn(pd, range); + return aper_get_constrained_whole_number(pd, lb, ub); } if (aper_get_align(pd) < 0) @@ -70,55 +69,117 @@ } ssize_t -aper_get_nsnnwn(asn_per_data_t *pd, int range) { - ssize_t value; - int bytes = 0; +aper_get_nsnnwn(asn_per_data_t *pd) { + int b; + int length; - ASN_DEBUG("getting nsnnwn with range %d", range); + ASN_DEBUG("getting nsnnwn"); - if(range <= 255) { - int i; + b = per_get_few_bits(pd, 1); + if (b == -1) + return -1; - if (range < 0) return -1; - /* 1 -> 8 bits */ - for (i = 1; i <= 8; i++) { - int upper = 1 << i; - if (upper >= range) - break; - } - value = per_get_few_bits(pd, i); - return value; - } else if (range == 256){ - /* 1 byte */ - bytes = 1; - } else if (range <= 65536) { - /* 2 bytes */ - bytes = 2; - } else { - //return -1; - int length; + /* X.691 2002 10.6.1 */ + if (b == 0) + return per_get_few_bits(pd, 6); - /* handle indefinite range */ - length = per_get_few_bits(pd, 1); - if (length == 0) - return per_get_few_bits(pd, 6); - - if (aper_get_align(pd) < 0) - return -1; - - length = per_get_few_bits(pd, 8); - /* the length is not likely to be that big */ - if (length > 4) - return -1; - value = 0; - if (per_get_many_bits(pd, (uint8_t *)&value, 0, length * 8) < 0) - return -1; - return value; - } if (aper_get_align(pd) < 0) return -1; - value = per_get_few_bits(pd, 8 * bytes); - return value; + + /* X.691 2002 10.6.2 */ + /* X.691 2002 10.9.3.5 */ + b = per_get_few_bits(pd, 1); + if (b == -1) + return -1; + + if (b == 1) { + /* other 10.9.3.x cases not handled, it's doubtful we reach them in practice */ + ASN_DEBUG("todo: X.691 2002 10.9.3.x"); + return -1; + } + + /* X.691 2002 10.9.3.6 */ + length = per_get_few_bits(pd, 7); + if (length > 4) { + /* todo */ + ASN_DEBUG("todo: X.691 2002 10.9.3.6 for length > 4"); + return -1; + } + ASN_DEBUG("length %d\n", length); + + /* todo: 0xffffffff will be seen as -1 and will lead to decoding failure */ + return per_get_few_bits(pd, length * 8); +} + +/* X.691 2002 10.5 - Decoding of a constrained whole number */ +long +aper_get_constrained_whole_number(asn_per_data_t *pd, long lb, long ub) { + assert(ub >= lb); + long range = ub - lb + 1; + int range_len; + int value_len; + long value; + + ASN_DEBUG("aper get constrained_whole_number with lb %ld and ub %ld", lb, ub); + + /* X.691 2002 10.5.4 */ + if (range == 1) + return lb; + + /* X.691 2002 10.5.7.1 - The bit-field case. */ + if (range <= 255) { + int bitfield_size = 8; + for (bitfield_size = 8; bitfield_size >= 2; bitfield_size--) + if ((range - 1) & (1 << (bitfield_size-1))) + break; + value = per_get_few_bits(pd, bitfield_size); + if (value < 0 || value >= range) + return -1; + return value + lb; + } + + /* X.691 2002 10.5.7.2 - The one-octet case. */ + if (range == 256) { + if (aper_get_align(pd)) + return -1; + value = per_get_few_bits(pd, 8); + if (value < 0 || value >= range) + return -1; + return value + lb; + } + + /* X.691 2002 10.5.7.3 - The two-octet case. */ + if (range <= 65536) { + if (aper_get_align(pd)) + return -1; + value = per_get_few_bits(pd, 16); + if (value < 0 || value >= range) + return -1; + return value + lb; + } + + /* X.691 2002 10.5.7.4 - The indefinite length case. */ + /* since we limit input to be 'long' we don't handle all numbers */ + /* and so length determinant is retrieved as X.691 2002 10.9.3.3 */ + /* number of bytes to store the range */ + for (range_len = 3; ; range_len++) { + long bits = ((long)1) << (8 * range_len); + if (range - 1 < bits) + break; + } + value_len = aper_get_constrained_whole_number(pd, 1, range_len); + if (value_len == -1) + return -1; + if (value_len > 4) { + ASN_DEBUG("todo: aper_get_constrained_whole_number: value_len > 4"); + return -1; + } + if (aper_get_align(pd)) + return -1; + value = per_get_few_bits(pd, value_len * 8); + if (value < 0 || value >= range) + return -1; + return value + lb; } int aper_put_align(asn_per_outp_t *po) { @@ -142,11 +203,9 @@ ASN_DEBUG("APER put length %zu with range (%zd..%zd)", n, lb, ub); - /* 11.9 X.691 Note 2 */ - if (constrained && ub < 65536) { - int range = ub - lb + 1; - return aper_put_nsnnwn(po, range, n) ? -1 : (ssize_t)n; - } + /* X.691 2002 10.9.3.3 */ + if (constrained && ub < 65536) + return aper_put_constrained_whole_number(po, lb, ub, n + lb) ? -1 : (ssize_t)n; if (aper_put_align(po) < 0) return -1; @@ -189,51 +248,113 @@ } int -aper_put_nsnnwn(asn_per_outp_t *po, int range, int number) { - int bytes; +aper_put_nsnnwn(asn_per_outp_t *po, int number) { + int len; - ASN_DEBUG("aper put nsnnwn %d with range %d", number, range); - /* 10.5.7.1 X.691 */ - if(range < 0) { - int i; - for (i = 1; ; i++) { - int bits = 1 << (8 * i); - if (number <= bits) - break; - } - bytes = i; - assert(i <= 4); + ASN_DEBUG("aper put nsnnwn %d", number); + + if (number <= 63) { + if (per_put_few_bits(po, 0, 1)) + return -1; + return per_put_few_bits(po, number, 6); } - if(range <= 255) { + + if (per_put_few_bits(po, 1, 1)) + return -1; + + if (number < 256) { + len = 1; + } else if (number < 65536) { + len = 2; + } else { /* number > 64K */ int i; - for (i = 1; i <= 8; i++) { - int bits = 1 << i; - if (range <= bits) - break; - } - return per_put_few_bits(po, number, i); - } else if(range == 256) { - if (number >= range) - return -1; - bytes = 1; - } else if(range <= 65536) { - if (number >= range) - return -1; - bytes = 2; - } else { /* Ranges > 64K */ - int i; - for (i = 1; ; i++) { + for (i = 3; ; i++) { int bits = 1 << (8 * i); - if (range <= bits) + if (number < bits) break; } - assert(i <= 4); - bytes = i; + len = i; + } + + if (aper_put_align(po) < 0) + return -1; + + /* put the length which is a non-constrained whole number */ + if (len <= 127) { + if(per_put_few_bits(po, 0, 1)) + return -1; + if(per_put_few_bits(po, len, 7)) + return -1; + } else { + /* todo but not big problem, it's very doubtful that the + * number of bytes to encode 'number' will be > 127 + */ + return -1; } if(aper_put_align(po) < 0) /* Aligning on octet */ return -1; -/* if(per_put_few_bits(po, bytes, 8)) + return per_put_few_bits(po, number, 8 * len); +} + +/* X.691 2002 10.5 - Encoding of a constrained whole number */ +int +aper_put_constrained_whole_number(asn_per_outp_t *po, long lb, long ub, long number) { + assert(ub >= lb); + long range = ub - lb + 1; + long value = number - lb; + int range_len; + int value_len; + + ASN_DEBUG("aper put constrained_whole_number %ld with lb %ld and ub %ld", number, lb, ub); + + if (number < lb || number > ub) return -1; -*/ - return per_put_few_bits(po, number, 8 * bytes); + + /* X.691 2002 10.5.4 */ + if (range == 1) + return 0; + + /* X.691 2002 10.5.7.1 - The bit-field case. */ + if (range <= 255) { + int bitfield_size = 8; + for (bitfield_size = 8; bitfield_size >= 2; bitfield_size--) + if ((range - 1) & (1 << (bitfield_size-1))) + break; + return per_put_few_bits(po, value, bitfield_size); + } + + /* X.691 2002 10.5.7.2 - The one-octet case. */ + if (range == 256) { + if (aper_put_align(po)) + return -1; + return per_put_few_bits(po, value, 8); + } + + /* X.691 2002 10.5.7.3 - The two-octet case. */ + if (range <= 65536) { + if (aper_put_align(po)) + return -1; + return per_put_few_bits(po, value, 16); + } + + /* X.691 2002 10.5.7.4 - The indefinite length case. */ + /* since we limit input to be 'long' we don't handle all numbers */ + /* and so length determinant is stored as X.691 2002 10.9.3.3 */ + /* number of bytes to store the range */ + for (range_len = 3; ; range_len++) { + int bits = 1 << (8 * range_len); + if (range - 1 < bits) + break; + } + /* number of bytes to store the value */ + for (value_len = 1; ; value_len++) { + long bits = ((long)1) << (8 * value_len); + if (value < bits) + break; + } + if (aper_put_constrained_whole_number(po, 1, range_len, value_len)) + return -1; + if (aper_put_align(po)) + return -1; + return per_put_few_bits(po, value, value_len * 8); } diff --git a/src/sbcap/gen/asn_application.c b/src/sbcap/gen/asn_application.c index 7992185..4309593 100644 --- a/src/sbcap/gen/asn_application.c +++ b/src/sbcap/gen/asn_application.c @@ -229,6 +229,9 @@ #if !defined(ASN_DISABLE_XER_SUPPORT) enum xer_encoder_flags_e xer_flags = XER_F_CANONICAL; #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) + enum jer_encoder_flags_e jer_flags = JER_F; +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ (void)opt_codec_ctx; /* Parameters are not checked on encode yet. */ @@ -432,9 +435,15 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + case ATS_JER_MINIFIED: + /* Currently JER_F and JER_F_MINIFIED have opposite purposes + * so we just flip the flag. */ + jer_flags &= ~JER_F; + jer_flags |= JER_F_MINIFIED; + /* Fall through. */ case ATS_JER: if(td->op->jer_encoder) { - er = jer_encode(td, sptr, callback, callback_key); + er = jer_encode(td, sptr, jer_flags, callback, callback_key); if(er.encoded == -1) { if(er.failed_type && er.failed_type->op->jer_encoder) { errno = EBADF; /* Structure has incorrect form. */ @@ -533,6 +542,15 @@ errno = ENOENT; ASN__DECODE_FAILED; #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ + + case ATS_JER: + case ATS_JER_MINIFIED: +#if !defined(ASN_DISABLE_JER_SUPPORT) + return jer_decode(opt_codec_ctx, td, sptr, buffer, size); +#else + errno = ENOENT; + ASN__DECODE_FAILED; +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ } } diff --git a/src/sbcap/gen/asn_internal.c b/src/sbcap/gen/asn_internal.c index c2a8108..1b28266 100644 --- a/src/sbcap/gen/asn_internal.c +++ b/src/sbcap/gen/asn_internal.c @@ -26,7 +26,9 @@ buf_size <<= 1; if(buf == scratch) { buf = MALLOC(buf_size); - if(!buf) return -1; + if(!buf) { + return -1; + } } else { void *p = REALLOC(buf, buf_size); if(!p) { diff --git a/src/sbcap/gen/asn_random_fill.c b/src/sbcap/gen/asn_random_fill.c index 2965362..4d14cbf 100644 --- a/src/sbcap/gen/asn_random_fill.c +++ b/src/sbcap/gen/asn_random_fill.c @@ -6,6 +6,7 @@ #include <asn_internal.h> #include <asn_random_fill.h> #include <constr_TYPE.h> +#include <stdlib.h> int asn_random_fill(const struct asn_TYPE_descriptor_s *td, void **struct_ptr, @@ -42,17 +43,22 @@ uintmax_t range = asn__intmax_range(lb, rb); uintmax_t value = 0; uintmax_t got_entropy = 0; - (void)intmax_max; - assert(RAND_MAX > 0xffffff); /* Seen 7ffffffd! */ + int max = 0xffffff; + +#ifdef __WIN32__ + max = RAND_MAX-1; +#endif + + assert(RAND_MAX > max); /* Seen 7ffffffd! */ assert(range < intmax_max); for(; got_entropy < range;) { - got_entropy = (got_entropy << 24) | 0xffffff; + got_entropy = (got_entropy << 24) | max; #ifdef HAVE_RANDOM - value = (value << 24) | (random() % 0xffffff); + value = (value << 24) | (random() % max); #else - value = (value << 24) | (rand() % 0xffffff); + value = (value << 24) | (rand() % max); #endif } diff --git a/src/sbcap/gen/constr_CHOICE.c b/src/sbcap/gen/constr_CHOICE.c index 5f52e3d..2a20583 100644 --- a/src/sbcap/gen/constr_CHOICE.c +++ b/src/sbcap/gen/constr_CHOICE.c @@ -13,6 +13,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ CHOICE_compare, + CHOICE_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) CHOICE_decode_ber, CHOICE_encode_der, @@ -28,9 +29,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + CHOICE_decode_jer, CHOICE_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) CHOICE_decode_oer, @@ -154,13 +157,14 @@ void CHOICE_free(const asn_TYPE_descriptor_t *td, void *ptr, enum asn_struct_free_method method) { - const asn_CHOICE_specifics_t *specs = - (const asn_CHOICE_specifics_t *)td->specifics; + const asn_CHOICE_specifics_t *specs; unsigned present; if(!td || !ptr) return; + specs = (const asn_CHOICE_specifics_t *)td->specifics; + ASN_DEBUG("Freeing %s as CHOICE", td->name); /* @@ -311,6 +315,59 @@ } } +int +CHOICE_copy(const asn_TYPE_descriptor_t *td, void **aptr, const void *bptr) { + if(!td) return -1; + + void *st = *aptr; + const asn_CHOICE_specifics_t *specs = + (const asn_CHOICE_specifics_t *)td->specifics; + const asn_TYPE_member_t *elm; /* CHOICE's element */ + int present; + int ret; + void *amemb; + void **amembp; + const void *bmemb; + + if(!bptr) { + if(st) { + ASN_STRUCT_FREE(*td, st); + *aptr = NULL; + } + return 0; + } + + if(!st) { + st = *aptr = CALLOC(1, specs->struct_size); + if(!st) return -1; + } + + present = _fetch_present_idx(bptr, + specs->pres_offset, specs->pres_size); + + if(present <= 0 && (unsigned)present > td->elements_count) return -1; + --present; + + elm = &td->elements[present]; + if(elm->flags & ATF_POINTER) { + /* Member is a pointer to another structure */ + amembp = (void **)((char *)st + elm->memb_offset); + bmemb = *(const void* const*)((const char*)bptr + elm->memb_offset); + } else { + amemb = (char *)st + elm->memb_offset; + amembp = &amemb; + bmemb = (const void*)((const char*)bptr + elm->memb_offset); + } + ret = elm->type->op->copy_struct(elm->type, amembp, bmemb); + if (ret != 0) return ret; + + _set_present_idx(st, + specs->pres_offset, + specs->pres_size, present + 1); + + return 0; +} + /* * Return the 1-based choice variant presence index. * Returns 0 in case of error. diff --git a/src/sbcap/gen/constr_CHOICE_aper.c b/src/sbcap/gen/constr_CHOICE_aper.c index 41040aa..0f07423 100644 --- a/src/sbcap/gen/constr_CHOICE_aper.c +++ b/src/sbcap/gen/constr_CHOICE_aper.c @@ -40,6 +40,8 @@ value = per_get_few_bits(pd, 1); if(value < 0) ASN__DECODE_STARVED; if(value) ct = 0; /* Not restricted */ + if((unsigned)value >= td->elements_count) + ASN__DECODE_FAILED; } if(ct && ct->range_bits >= 0) { @@ -53,8 +55,8 @@ if(specs->ext_start == -1) ASN__DECODE_FAILED; - if(specs && specs->tag2el_count > specs->ext_start) { - value = aper_get_nsnnwn(pd, specs->tag2el_count - specs->ext_start); /* extension elements range */ + if(specs && specs->tag2el_count > (unsigned)specs->ext_start) { + value = aper_get_nsnnwn(pd); /* extension elements range */ if(value < 0) ASN__DECODE_STARVED; value += specs->ext_start; if((unsigned)value >= td->elements_count) @@ -166,11 +168,7 @@ asn_enc_rval_t rval = {0,0,0}; if(specs->ext_start == -1) ASN__ENCODE_FAILED; - int n = present - specs->ext_start; - if(n <= 63) { - if(n < 0) ASN__ENCODE_FAILED; - if(per_put_few_bits(po, n, 7)) ASN__ENCODE_FAILED; - } else + if(aper_put_nsnnwn(po, present - specs->ext_start)) ASN__ENCODE_FAILED; if(aper_open_type_put(elm->type, elm->encoding_constraints.per_constraints, memb_ptr, po)) diff --git a/src/sbcap/gen/constr_SEQUENCE.c b/src/sbcap/gen/constr_SEQUENCE.c index 8397d0c..a77b68f 100644 --- a/src/sbcap/gen/constr_SEQUENCE.c +++ b/src/sbcap/gen/constr_SEQUENCE.c @@ -14,6 +14,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ SEQUENCE_compare, + SEQUENCE_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) SEQUENCE_decode_ber, SEQUENCE_encode_der, @@ -29,9 +30,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + SEQUENCE_decode_jer, SEQUENCE_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) SEQUENCE_decode_oer, @@ -66,13 +69,14 @@ SEQUENCE_free(const asn_TYPE_descriptor_t *td, void *sptr, enum asn_struct_free_method method) { size_t edx; - const asn_SEQUENCE_specifics_t *specs = - (const asn_SEQUENCE_specifics_t *)td->specifics; + const asn_SEQUENCE_specifics_t *specs; asn_struct_ctx_t *ctx; /* Decoder context */ if(!td || !sptr) return; + specs = (const asn_SEQUENCE_specifics_t *)td->specifics; + ASN_DEBUG("Freeing %s as SEQUENCE", td->name); for(edx = 0; edx < td->elements_count; edx++) { @@ -195,3 +199,53 @@ return 0; } + +int +SEQUENCE_copy(const asn_TYPE_descriptor_t *td, void **aptr, + const void *bptr) { + if(!td) return -1; + + const asn_SEQUENCE_specifics_t *specs = + (const asn_SEQUENCE_specifics_t *)td->specifics; + size_t edx; + void *st = *aptr; /* Target structure */ + + if(!bptr) { + if(st) { + SEQUENCE_free(td, st, 0); + *aptr = 0; + } + return 0; + } + + /* + * Create the target structure if it is not present already. + */ + if(st == 0) { + st = *aptr = CALLOC(1, specs->struct_size); + if(st == 0) return -1; + } + + for(edx = 0; edx < td->elements_count; edx++) { + asn_TYPE_member_t *elm = &td->elements[edx]; + void *amemb; + void **amembp; + const void *bmemb; + int ret; + + if(elm->flags & ATF_POINTER) { + /* Member is a pointer to another structure */ + amembp = (void **)((char *)st + elm->memb_offset); + bmemb = *(const void* const*)((const char*)bptr + elm->memb_offset); + } else { + amemb = (char *)st + elm->memb_offset; + amembp = &amemb; + bmemb = (const void*)((const char*)bptr + elm->memb_offset); + } + + ret = elm->type->op->copy_struct(elm->type, amembp, bmemb); + if(ret != 0) return ret; + } + + return 0; +} diff --git a/src/sbcap/gen/constr_SEQUENCE_OF.c b/src/sbcap/gen/constr_SEQUENCE_OF.c index 9c5d6cd..6ec3888 100644 --- a/src/sbcap/gen/constr_SEQUENCE_OF.c +++ b/src/sbcap/gen/constr_SEQUENCE_OF.c @@ -15,6 +15,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ SEQUENCE_OF_compare, + SEQUENCE_OF_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) SEQUENCE_OF_decode_ber, SEQUENCE_OF_encode_der, @@ -30,9 +31,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + SEQUENCE_OF_decode_jer, SEQUENCE_OF_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) SEQUENCE_OF_decode_oer, /* Same as SET OF decoder. */ diff --git a/src/sbcap/gen/constr_SET_OF.c b/src/sbcap/gen/constr_SET_OF.c index 97a7cac..f5cc3ba 100644 --- a/src/sbcap/gen/constr_SET_OF.c +++ b/src/sbcap/gen/constr_SET_OF.c @@ -14,6 +14,7 @@ 0, #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ SET_OF_compare, + SET_OF_copy, #if !defined(ASN_DISABLE_BER_SUPPORT) SET_OF_decode_ber, SET_OF_encode_der, @@ -29,9 +30,11 @@ 0, #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) + SET_OF_decode_jer, SET_OF_encode_jer, #else 0, + 0, #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_OER_SUPPORT) SET_OF_decode_oer, @@ -369,3 +372,58 @@ return 0; } + +int +SET_OF_copy(const asn_TYPE_descriptor_t *td, void **aptr, + const void *bptr) { + if(!td) return -1; + + const asn_SET_OF_specifics_t *specs = + (const asn_SET_OF_specifics_t *)td->specifics; + void *st = *aptr; + + if(!bptr) { + if(*aptr) { + asn_set_empty(_A_SET_FROM_VOID(*aptr)); + *aptr = 0; + } + return 0; + } + + if(st == 0) { + st = *aptr = CALLOC(1, specs->struct_size); + if(st == 0) return -1; + } + + asn_anonymous_set_ *a = _A_SET_FROM_VOID(*aptr); + const asn_anonymous_set_ *b = _A_CSET_FROM_VOID(bptr); + + if(b->size) { + void *_new_arr; + _new_arr = REALLOC(a->array, b->size * sizeof(b->array[0])); + if(_new_arr) { + a->array = (void **)_new_arr; + a->size = b->size; + } else { + return -1; + } + a->count = b->count; + + for(int i = 0; i < b->count; i++) { + void *bmemb = b->array[i]; + if(bmemb) { + void *amemb = 0; + int ret; + ret = td->elements->type->op->copy_struct( + td->elements->type, + &amemb, bmemb); + if(ret != 0) return ret; + a->array[i] = amemb; + } else { + a->array[i] = 0; + } + } + } + + return 0; +} diff --git a/src/sbcap/gen/constr_SET_OF_aper.c b/src/sbcap/gen/constr_SET_OF_aper.c index 87c341e..f959b17 100644 --- a/src/sbcap/gen/constr_SET_OF_aper.c +++ b/src/sbcap/gen/constr_SET_OF_aper.c @@ -129,13 +129,12 @@ if(value) ct = 0; /* Not restricted! */ } - if(ct && ct->effective_bits >= 0) { + if(ct && ct->upper_bound >= 1 && ct->upper_bound <= 65535 + && ct->upper_bound == ct->lower_bound) { /* X.691, #19.5: No length determinant */ - nelems = aper_get_nsnnwn(pd, ct->upper_bound - ct->lower_bound + 1); - ASN_DEBUG("Preparing to fetch %ld+%lld elements from %s", - (long)nelems, (long long int)ct->lower_bound, td->name); - if(nelems < 0) ASN__DECODE_STARVED; - nelems += ct->lower_bound; + nelems = ct->upper_bound; + ASN_DEBUG("Preparing to fetch %ld elements from %s", + (long)nelems, td->name); } else { nelems = -1; } diff --git a/src/sbcap/gen/constr_TYPE.c b/src/sbcap/gen/constr_TYPE.c index e634e75..5f0212b 100644 --- a/src/sbcap/gen/constr_TYPE.c +++ b/src/sbcap/gen/constr_TYPE.c @@ -9,7 +9,7 @@ /* * Version of the ASN.1 infrastructure shipped with compiler. */ -int get_asn1c_environment_version() { return ASN1C_ENVIRONMENT_VERSION; } +int get_asn1c_environment_version(void) { return ASN1C_ENVIRONMENT_VERSION; } static asn_app_consume_bytes_f _print2fp; @@ -54,6 +54,26 @@ return fflush(stream); } +/* + * Copy a structuture. + */ +int +asn_copy(const asn_TYPE_descriptor_t *td, + void **struct_dst, const void *struct_src) { + + if(!td || !struct_dst || !struct_src) { + errno = EINVAL; + return -1; + } + + if(!td->op) { + errno = ENOSYS; + return -1; + } + + return td->op->copy_struct(td, struct_dst, struct_src); +} + /* Dump the data into the specified stdio stream */ static int _print2fp(const void *buffer, size_t size, void *app_key) { diff --git a/src/sbcap/skel/ANY.h b/src/sbcap/skel/ANY.h index 871ed5e..6434aab 100644 --- a/src/sbcap/skel/ANY.h +++ b/src/sbcap/skel/ANY.h @@ -29,6 +29,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define ANY_compare OCTET_STRING_compare +#define ANY_copy OCTET_STRING_copy #define ANY_constraint asn_generic_no_constraint @@ -43,6 +44,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f ANY_decode_jer; jer_type_encoder_f ANY_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/BIT_STRING.h b/src/sbcap/skel/BIT_STRING.h index e755fe9..0b71feb 100644 --- a/src/sbcap/skel/BIT_STRING.h +++ b/src/sbcap/skel/BIT_STRING.h @@ -31,6 +31,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f BIT_STRING_compare; +asn_struct_copy_f BIT_STRING_copy; asn_constr_check_f BIT_STRING_constraint; @@ -45,6 +46,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define BIT_STRING_decode_jer OCTET_STRING_decode_jer_binary jer_type_encoder_f BIT_STRING_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/BMPString.h b/src/sbcap/skel/BMPString.h index 1707a9e..3b32cf3 100644 --- a/src/sbcap/skel/BMPString.h +++ b/src/sbcap/skel/BMPString.h @@ -28,6 +28,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define BMPString_compare OCTET_STRING_compare +#define BMPString_copy OCTET_STRING_copy asn_constr_check_f BMPString_constraint; @@ -42,6 +43,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f BMPString_decode_jer; jer_type_encoder_f BMPString_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/BOOLEAN.h b/src/sbcap/skel/BOOLEAN.h index 2cbbe71..8b9b496 100644 --- a/src/sbcap/skel/BOOLEAN.h +++ b/src/sbcap/skel/BOOLEAN.h @@ -28,6 +28,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f BOOLEAN_compare; +asn_struct_copy_f BOOLEAN_copy; #define BOOLEAN_constraint asn_generic_no_constraint @@ -42,6 +43,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f BOOLEAN_decode_jer; jer_type_encoder_f BOOLEAN_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/ENUMERATED.h b/src/sbcap/skel/ENUMERATED.h index d3983de..b151903 100644 --- a/src/sbcap/skel/ENUMERATED.h +++ b/src/sbcap/skel/ENUMERATED.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define ENUMERATED_compare INTEGER_compare +#define ENUMERATED_copy INTEGER_copy #define ENUMERATED_constraint asn_generic_no_constraint @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f ENUMERATED_decode_jer; #define ENUMERATED_encode_jer INTEGER_encode_jer #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/GeneralString.h b/src/sbcap/skel/GeneralString.h index 418e66b..2815245 100644 --- a/src/sbcap/skel/GeneralString.h +++ b/src/sbcap/skel/GeneralString.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define GeneralString_compare OCTET_STRING_compare +#define GeneralString_copy OCTET_STRING_copy #define GeneralString_constraint asn_generic_unknown_constraint @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define GeneralString_decode_jer OCTET_STRING_decode_jer_hex #define GeneralString_encode_jer OCTET_STRING_encode_jer #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/GeneralizedTime.h b/src/sbcap/skel/GeneralizedTime.h index 2a86f7a..8a00738 100644 --- a/src/sbcap/skel/GeneralizedTime.h +++ b/src/sbcap/skel/GeneralizedTime.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f GeneralizedTime_compare; +#define GeneralizedTime_copy OCTET_STRING_copy asn_constr_check_f GeneralizedTime_constraint; @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define GeneralizedTime_decode_jer OCTET_STRING_decode_jer_utf8 jer_type_encoder_f GeneralizedTime_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/GraphicString.h b/src/sbcap/skel/GraphicString.h index 807e9d6..9368e50 100644 --- a/src/sbcap/skel/GraphicString.h +++ b/src/sbcap/skel/GraphicString.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define GraphicString_compare OCTET_STRING_compare +#define GraphicString_copy OCTET_STRING_copy #define GraphicString_constraint asn_generic_unknown_constraint @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define GraphicString_decode_jer OCTET_STRING_decode_jer #define GraphicString_encode_jer OCTET_STRING_encode_jer #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/IA5String.h b/src/sbcap/skel/IA5String.h index 195f474..0a408a5 100644 --- a/src/sbcap/skel/IA5String.h +++ b/src/sbcap/skel/IA5String.h @@ -26,6 +26,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define IA5String_compare OCTET_STRING_compare +#define IA5String_copy OCTET_STRING_copy asn_constr_check_f IA5String_constraint; @@ -40,6 +41,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define IA5String_decode_jer OCTET_STRING_decode_jer_utf8 #define IA5String_encode_jer OCTET_STRING_encode_jer_utf8 #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/INTEGER.h b/src/sbcap/skel/INTEGER.h index 1666e0b..5fa1c7b 100644 --- a/src/sbcap/skel/INTEGER.h +++ b/src/sbcap/skel/INTEGER.h @@ -47,6 +47,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f INTEGER_compare; +asn_struct_copy_f INTEGER_copy; #define INTEGER_constraint asn_generic_no_constraint @@ -61,6 +62,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f INTEGER_decode_jer; jer_type_encoder_f INTEGER_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ @@ -106,6 +108,8 @@ int asn_INTEGER2ulong(const INTEGER_t *i, unsigned long *l); int asn_long2INTEGER(INTEGER_t *i, long l); int asn_ulong2INTEGER(INTEGER_t *i, unsigned long l); +int asn_INTEGER2int64(const INTEGER_t *i, int64_t *l); +int asn_INTEGER2uint64(const INTEGER_t *i, uint64_t *l); int asn_int642INTEGER(INTEGER_t *i, int64_t l); int asn_uint642INTEGER(INTEGER_t *i, uint64_t l); diff --git a/src/sbcap/skel/ISO646String.h b/src/sbcap/skel/ISO646String.h index 76757d5..76382d7 100644 --- a/src/sbcap/skel/ISO646String.h +++ b/src/sbcap/skel/ISO646String.h @@ -24,6 +24,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define ISO646String_compare OCTET_STRING_compare +#define ISO646String_copy OCTET_STRING_copy #define ISO646String_constraint VisibleString_constraint @@ -38,6 +39,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define ISO646String_decode_jer OCTET_STRING_decode_jer_utf8 #define ISO646String_encode_jer OCTET_STRING_encode_jer_utf8 #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/NULL.h b/src/sbcap/skel/NULL.h index 7264475..ca9d6fa 100644 --- a/src/sbcap/skel/NULL.h +++ b/src/sbcap/skel/NULL.h @@ -27,6 +27,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f NULL_compare; +asn_struct_copy_f NULL_copy; #define NULL_constraint asn_generic_no_constraint @@ -41,6 +42,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f NULL_decode_jer; jer_type_encoder_f NULL_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/NativeEnumerated.h b/src/sbcap/skel/NativeEnumerated.h index 0c711e3..8c045e5 100644 --- a/src/sbcap/skel/NativeEnumerated.h +++ b/src/sbcap/skel/NativeEnumerated.h @@ -13,6 +13,7 @@ #define _NativeEnumerated_H_ #include <NativeInteger.h> +#include <ENUMERATED.h> #ifdef __cplusplus extern "C" { @@ -28,6 +29,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define NativeEnumerated_compare NativeInteger_compare +#define NativeEnumerated_copy NativeInteger_copy #define NativeEnumerated_constraint asn_generic_no_constraint @@ -42,6 +44,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f NativeEnumerated_decode_jer; jer_type_encoder_f NativeEnumerated_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/NativeInteger.h b/src/sbcap/skel/NativeInteger.h index 3a47c11..352926b 100644 --- a/src/sbcap/skel/NativeInteger.h +++ b/src/sbcap/skel/NativeInteger.h @@ -29,6 +29,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f NativeInteger_compare; +asn_struct_copy_f NativeInteger_copy; #define NativeInteger_constraint asn_generic_no_constraint @@ -43,6 +44,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f NativeInteger_decode_jer; jer_type_encoder_f NativeInteger_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/NativeReal.h b/src/sbcap/skel/NativeReal.h index 513876e..2007fbd 100644 --- a/src/sbcap/skel/NativeReal.h +++ b/src/sbcap/skel/NativeReal.h @@ -37,6 +37,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f NativeReal_compare; +asn_struct_copy_f NativeReal_copy; #define NativeReal_constraint asn_generic_no_constraint @@ -51,6 +52,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f NativeReal_decode_jer; jer_type_encoder_f NativeReal_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/NumericString.h b/src/sbcap/skel/NumericString.h index 76b0553..c0c1210 100644 --- a/src/sbcap/skel/NumericString.h +++ b/src/sbcap/skel/NumericString.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define NumericString_compare OCTET_STRING_compare +#define NumericString_copy OCTET_STRING_copy asn_constr_check_f NumericString_constraint; @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define NumericString_decode_jer OCTET_STRING_decode_jer_utf8 #define NumericString_encode_jer OCTET_STRING_encode_jer_utf8 #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/OBJECT_IDENTIFIER.h b/src/sbcap/skel/OBJECT_IDENTIFIER.h index f878055..cef8c6c 100644 --- a/src/sbcap/skel/OBJECT_IDENTIFIER.h +++ b/src/sbcap/skel/OBJECT_IDENTIFIER.h @@ -32,6 +32,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define OBJECT_IDENTIFIER_compare OCTET_STRING_compare +#define OBJECT_IDENTIFIER_copy OCTET_STRING_copy asn_constr_check_f OBJECT_IDENTIFIER_constraint; @@ -46,6 +47,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f OBJECT_IDENTIFIER_decode_jer; jer_type_encoder_f OBJECT_IDENTIFIER_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/OCTET_STRING.h b/src/sbcap/skel/OCTET_STRING.h index b1ace14..1340865 100644 --- a/src/sbcap/skel/OCTET_STRING.h +++ b/src/sbcap/skel/OCTET_STRING.h @@ -29,6 +29,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f OCTET_STRING_compare; +asn_struct_copy_f OCTET_STRING_copy; #define OCTET_STRING_constraint asn_generic_no_constraint @@ -46,6 +47,8 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f OCTET_STRING_decode_jer_hex; /* Hexadecimal */ +jer_type_decoder_f OCTET_STRING_decode_jer_utf8; /* ASCII/UTF-8 */ jer_type_encoder_f OCTET_STRING_encode_jer; jer_type_encoder_f OCTET_STRING_encode_jer_utf8; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/OPEN_TYPE.h b/src/sbcap/skel/OPEN_TYPE.h index 5e97977..c4b5d1b 100644 --- a/src/sbcap/skel/OPEN_TYPE.h +++ b/src/sbcap/skel/OPEN_TYPE.h @@ -33,6 +33,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define OPEN_TYPE_compare CHOICE_compare +#define OPEN_TYPE_copy CHOICE_copy #define OPEN_TYPE_constraint CHOICE_constraint @@ -59,6 +60,13 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +asn_dec_rval_t OPEN_TYPE_jer_get( + const asn_codec_ctx_t *opt_codec_ctx, + const asn_TYPE_descriptor_t *parent_type, + void *parent_structure, + const asn_TYPE_member_t *element, + const void *ptr, size_t size); +#define OPEN_TYPE_decode_jer NULL #define OPEN_TYPE_encode_jer CHOICE_encode_jer #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ @@ -70,7 +78,10 @@ asn_TYPE_member_t *element, const void *ptr, size_t size); #define OPEN_TYPE_decode_oer NULL -#define OPEN_TYPE_encode_oer CHOICE_encode_oer +asn_enc_rval_t OPEN_TYPE_encode_oer( + const asn_TYPE_descriptor_t *type_descriptor, + const asn_oer_constraints_t *constraints, const void *struct_ptr, + asn_app_consume_bytes_f *consume_bytes_cb, void *app_key); #endif /* !defined(ASN_DISABLE_OER_SUPPORT) */ #if !defined(ASN_DISABLE_UPER_SUPPORT) diff --git a/src/sbcap/skel/ObjectDescriptor.h b/src/sbcap/skel/ObjectDescriptor.h index 852c45d..b70c0cb 100644 --- a/src/sbcap/skel/ObjectDescriptor.h +++ b/src/sbcap/skel/ObjectDescriptor.h @@ -35,6 +35,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define ObjectDescriptor_decode_jer OCTET_STRING_decode_jer_utf8 #define ObjectDescriptor_encode_jer OCTET_STRING_encode_jer_utf8 #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/PrintableString.h b/src/sbcap/skel/PrintableString.h index c24861d..aa37f39 100644 --- a/src/sbcap/skel/PrintableString.h +++ b/src/sbcap/skel/PrintableString.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define PrintableString_compare OCTET_STRING_compare +#define PrintableString_copy OCTET_STRING_copy asn_constr_check_f PrintableString_constraint; @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define PrintableString_decode_jer OCTET_STRING_decode_jer_utf8 #define PrintableString_encode_jer OCTET_STRING_encode_jer_utf8 #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/REAL.h b/src/sbcap/skel/REAL.h index 2f8bf47..2aa470e 100644 --- a/src/sbcap/skel/REAL.h +++ b/src/sbcap/skel/REAL.h @@ -54,6 +54,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f REAL_compare; +asn_struct_copy_f REAL_copy; #define REAL_constraint asn_generic_no_constraint @@ -68,6 +69,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f REAL_decode_jer; jer_type_encoder_f REAL_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/RELATIVE-OID.h b/src/sbcap/skel/RELATIVE-OID.h index 67deba4..4246fea 100644 --- a/src/sbcap/skel/RELATIVE-OID.h +++ b/src/sbcap/skel/RELATIVE-OID.h @@ -28,6 +28,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define RELATIVE_OID_compare OCTET_STRING_compare +#define RELATIVE_OID_copy OCTET_STRING_copy #define RELATIVE_OID_constraint asn_generic_no_constraint @@ -42,6 +43,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f RELATIVE_OID_decode_jer; jer_type_encoder_f RELATIVE_OID_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/T61String.h b/src/sbcap/skel/T61String.h index 6b724d8..640b1f5 100644 --- a/src/sbcap/skel/T61String.h +++ b/src/sbcap/skel/T61String.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define T61String_compare OCTET_STRING_compare +#define T61String_copy OCTET_STRING_copy #define T61String_constraint asn_generic_unknown_constraint @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define T61String_decode_jer OCTET_STRING_decode_jer_hex #define T61String_encode_jer OCTET_STRING_encode_jer #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/TeletexString.h b/src/sbcap/skel/TeletexString.h index 1be8c9e..e8ec031 100644 --- a/src/sbcap/skel/TeletexString.h +++ b/src/sbcap/skel/TeletexString.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define TeletexString_compare OCTET_STRING_compare +#define TeletexString_copy OCTET_STRING_copy #define TeletexString_constraint asn_generic_unknown_constraint @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define TeletexString_decode_jer OCTET_STRING_decode_jer_hex #define TeletexString_encode_jer OCTET_STRING_encode_jer #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/UTCTime.h b/src/sbcap/skel/UTCTime.h index 4dd05f5..bdcf1a9 100644 --- a/src/sbcap/skel/UTCTime.h +++ b/src/sbcap/skel/UTCTime.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f UTCTime_compare; +#define UTCTime_copy OCTET_STRING_copy asn_constr_check_f UTCTime_constraint; @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define UTCTime_decode_jer OCTET_STRING_decode_jer_utf8 jer_type_encoder_f UTCTime_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/UTF8String.h b/src/sbcap/skel/UTF8String.h index 3a31def..e1fefee 100644 --- a/src/sbcap/skel/UTF8String.h +++ b/src/sbcap/skel/UTF8String.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define UTF8String_compare OCTET_STRING_compare +#define UTF8String_copy OCTET_STRING_copy asn_constr_check_f UTF8String_constraint; @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define UTF8String_decode_jer OCTET_STRING_decode_jer_utf8 #define UTF8String_encode_jer OCTET_STRING_encode_jer_utf8 #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/UniversalString.h b/src/sbcap/skel/UniversalString.h index e7f6856..3bddfbf 100644 --- a/src/sbcap/skel/UniversalString.h +++ b/src/sbcap/skel/UniversalString.h @@ -24,6 +24,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define UniversalString_compare OCTET_STRING_compare +#define UniversalString_copy OCTET_STRING_copy asn_constr_check_f UniversalString_constraint; @@ -38,6 +39,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f UniversalString_decode_jer; jer_type_encoder_f UniversalString_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/VideotexString.h b/src/sbcap/skel/VideotexString.h index ec9b7dd..ea991df 100644 --- a/src/sbcap/skel/VideotexString.h +++ b/src/sbcap/skel/VideotexString.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define VideotexString_compare OCTET_STRING_compare +#define VideotexString_copy OCTET_STRING_copy #define VideotexString_constraint asn_generic_unknown_constraint @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define VideotexString_decode_jer OCTET_STRING_decode_jer_hex #define VideotexString_encode_jer OCTET_STRING_encode_jer #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/VisibleString.h b/src/sbcap/skel/VisibleString.h index 4ed5763..013f12f 100644 --- a/src/sbcap/skel/VisibleString.h +++ b/src/sbcap/skel/VisibleString.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ #define VisibleString_compare OCTET_STRING_compare +#define VisibleString_copy OCTET_STRING_copy asn_constr_check_f VisibleString_constraint; @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define VisibleString_decode_jer OCTET_STRING_decode_jer_hex #define VisibleString_encode_jer OCTET_STRING_encode_jer #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/aper_support.h b/src/sbcap/skel/aper_support.h index a372445..62d3790 100644 --- a/src/sbcap/skel/aper_support.h +++ b/src/sbcap/skel/aper_support.h @@ -27,7 +27,12 @@ /* * Get the normally small non-negative whole number. */ -ssize_t aper_get_nsnnwn(asn_per_data_t *pd, int range); +ssize_t aper_get_nsnnwn(asn_per_data_t *pd); + +/* + * Get the constrained whole number. + */ +long aper_get_constrained_whole_number(asn_per_data_t *po, long lb, long ub); /* * X.691 (08/2015) #11.9 "General rules for encoding a length determinant" @@ -54,7 +59,12 @@ /* * Put the normally small non-negative whole number. */ -int aper_put_nsnnwn(asn_per_outp_t *po, int range, int number); +int aper_put_nsnnwn(asn_per_outp_t *po, int number); + +/* + * Put the constrained whole number. + */ +int aper_put_constrained_whole_number(asn_per_outp_t *po, long lb, long ub, long number); #ifdef __cplusplus } diff --git a/src/sbcap/skel/asn_application.h b/src/sbcap/skel/asn_application.h index bf10cd3..355bc84 100644 --- a/src/sbcap/skel/asn_application.h +++ b/src/sbcap/skel/asn_application.h @@ -61,7 +61,13 @@ */ ATS_BASIC_XER, ATS_CANONICAL_XER, + /* + * X.697: + * JER: JSON Encoding Rules. + * MINIFIED produces a whitespace-free JSON. + */ ATS_JER, + ATS_JER_MINIFIED, }; /* diff --git a/src/sbcap/skel/asn_codecs_prim.h b/src/sbcap/skel/asn_codecs_prim.h index 5bbd9cf..8647ab9 100644 --- a/src/sbcap/skel/asn_codecs_prim.h +++ b/src/sbcap/skel/asn_codecs_prim.h @@ -49,6 +49,32 @@ xer_primitive_body_decoder_f *prim_body_decoder); #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ +#if !defined(ASN_DISABLE_JER_SUPPORT) +/* + * A callback specification for the jer_decode_primitive() function below. + */ +enum jer_pbd_rval { + JPBD_SYSTEM_FAILURE, /* System failure (memory shortage, etc) */ + JPBD_DECODER_LIMIT, /* Hit some decoder limitation or deficiency */ + JPBD_BROKEN_ENCODING, /* Encoding of a primitive body is broken */ + JPBD_NOT_BODY_IGNORE, /* Not a body format, but safe to ignore */ + JPBD_BODY_CONSUMED /* Body is recognized and consumed */ +}; +typedef enum jer_pbd_rval(jer_primitive_body_decoder_f)( + const asn_TYPE_descriptor_t *td, void *struct_ptr, const void *chunk_buf, + size_t chunk_size); + +/* + * Specific function to decode simple primitive types. + * Also see jer_decode_general() in jer_decoder.h + */ +asn_dec_rval_t jer_decode_primitive( + const asn_codec_ctx_t *opt_codec_ctx, + const asn_TYPE_descriptor_t *type_descriptor, void **struct_ptr, + size_t struct_size, const void *buf_ptr, size_t size, + jer_primitive_body_decoder_f *prim_body_decoder); +#endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ + #ifdef __cplusplus } #endif diff --git a/src/sbcap/skel/asn_system.h b/src/sbcap/skel/asn_system.h index 0f0d495..eab32c9 100644 --- a/src/sbcap/skel/asn_system.h +++ b/src/sbcap/skel/asn_system.h @@ -78,12 +78,24 @@ #else /* !defined(__vxworks) */ #include <inttypes.h> /* C99 specifies this file */ +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> /* for ntohl() */ +#define sys_ntohl(foo) ntohl(foo) +#else /* !_HAVE_ARPA_INET_H */ #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> /* for ntohl() */ -#endif #define sys_ntohl(foo) ntohl(foo) +#else /* !_HAVE_NETINET_IN_H */ +/* Here's the definition of ntohl() */ +#define sys_ntohl(l) ((((l) << 24) & 0xff000000) \ + | (((l) << 8) & 0xff0000) \ + | (((l) >> 8) & 0xff00) \ + | ((l >> 24) & 0xff)) +#endif /* HAVE_NETINET_IN_H */ +#endif /* HAVE_ARPA_INET_H */ #endif /* defined(__vxworks) */ + #endif /* _WIN32 */ #if __GNUC__ >= 3 || defined(__clang__) diff --git a/src/sbcap/skel/constr_CHOICE.h b/src/sbcap/skel/constr_CHOICE.h index 03d606c..1bec3ca 100644 --- a/src/sbcap/skel/constr_CHOICE.h +++ b/src/sbcap/skel/constr_CHOICE.h @@ -46,6 +46,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f CHOICE_compare; +asn_struct_copy_f CHOICE_copy; asn_constr_check_f CHOICE_constraint; @@ -60,6 +61,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f CHOICE_decode_jer; jer_type_encoder_f CHOICE_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/constr_SEQUENCE.h b/src/sbcap/skel/constr_SEQUENCE.h index 5ecfd8f..a3f50d1 100644 --- a/src/sbcap/skel/constr_SEQUENCE.h +++ b/src/sbcap/skel/constr_SEQUENCE.h @@ -51,6 +51,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f SEQUENCE_compare; +asn_struct_copy_f SEQUENCE_copy; asn_constr_check_f SEQUENCE_constraint; @@ -65,6 +66,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f SEQUENCE_decode_jer; jer_type_encoder_f SEQUENCE_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/constr_SEQUENCE_OF.h b/src/sbcap/skel/constr_SEQUENCE_OF.h index 1768582..978ad8e 100644 --- a/src/sbcap/skel/constr_SEQUENCE_OF.h +++ b/src/sbcap/skel/constr_SEQUENCE_OF.h @@ -23,6 +23,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f SEQUENCE_OF_compare; +#define SEQUENCE_OF_copy SET_OF_copy #define SEQUENCE_OF_constraint SET_OF_constraint @@ -37,6 +38,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#define SEQUENCE_OF_decode_jer SET_OF_decode_jer jer_type_encoder_f SEQUENCE_OF_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/constr_SET.h b/src/sbcap/skel/constr_SET.h index 2d03c8e..9dd4475 100644 --- a/src/sbcap/skel/constr_SET.h +++ b/src/sbcap/skel/constr_SET.h @@ -52,6 +52,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f SET_compare; +asn_struct_copy_f SET_copy; asn_constr_check_f SET_constraint; @@ -66,7 +67,8 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) -jer_type_encoder_f SET_encode_jer; +jer_type_decoder_f SET_decode_jer; +jer_type_encoder_f SEQUENCE_encode_jer; /* X.697 29. (2021) */ #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ #if !defined(ASN_DISABLE_UPER_SUPPORT) diff --git a/src/sbcap/skel/constr_SET_OF.h b/src/sbcap/skel/constr_SET_OF.h index 0e9dd39..82ead58 100644 --- a/src/sbcap/skel/constr_SET_OF.h +++ b/src/sbcap/skel/constr_SET_OF.h @@ -33,6 +33,7 @@ #endif /* !defined(ASN_DISABLE_PRINT_SUPPORT) */ asn_struct_compare_f SET_OF_compare; +asn_struct_copy_f SET_OF_copy; asn_constr_check_f SET_OF_constraint; @@ -47,6 +48,7 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +jer_type_decoder_f SET_OF_decode_jer; jer_type_encoder_f SET_OF_encode_jer; #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ diff --git a/src/sbcap/skel/constr_TYPE.h b/src/sbcap/skel/constr_TYPE.h index 55c2574..b64d5b5 100644 --- a/src/sbcap/skel/constr_TYPE.h +++ b/src/sbcap/skel/constr_TYPE.h @@ -51,8 +51,10 @@ #endif /* !defined(ASN_DISABLE_XER_SUPPORT) */ #if !defined(ASN_DISABLE_JER_SUPPORT) +#include <jer_decoder.h> /* Decoder of JER (JSON, text) */ #include <jer_encoder.h> /* Encoder into JER (JSON, text) */ #else +typedef void (jer_type_decoder_f)(void); typedef void (jer_type_encoder_f)(void); #endif /* !defined(ASN_DISABLE_JER_SUPPORT) */ @@ -142,6 +144,16 @@ const void *struct_B); /* + * Copies struct B into struct A. + * Allocates memory for struct A, if necessary. + */ +typedef int (asn_struct_copy_f)( + const struct asn_TYPE_descriptor_s *type_descriptor, + void **struct_A, + const void *struct_B + ); + +/* * Return the outmost tag of the type. * If the type is untagged CHOICE, the dynamic operation is performed. * NOTE: This function pointer type is only useful internally. @@ -173,10 +185,12 @@ asn_struct_free_f *free_struct; /* Free the structure */ asn_struct_print_f *print_struct; /* Human readable output */ asn_struct_compare_f *compare_struct; /* Compare two structures */ + asn_struct_copy_f *copy_struct; /* Copy method */ ber_type_decoder_f *ber_decoder; /* Generic BER decoder */ der_type_encoder_f *der_encoder; /* Canonical DER encoder */ xer_type_decoder_f *xer_decoder; /* Generic XER decoder */ xer_type_encoder_f *xer_encoder; /* [Canonical] XER encoder */ + jer_type_decoder_f *jer_decoder; /* Generic JER encoder */ jer_type_encoder_f *jer_encoder; /* Generic JER encoder */ oer_type_decoder_f *oer_decoder; /* Generic OER decoder */ oer_type_encoder_f *oer_encoder; /* Canonical OER encoder */ @@ -288,6 +302,17 @@ const asn_TYPE_descriptor_t *td, /* ASN.1 type descriptor */ const void *struct_ptr); /* Structure to be printed */ +/* + * Copies a source structure (struct_src) into destination structure + * (struct_dst). Allocates memory for the destination structure, if necessary. + * RETURN VALUES: + * 0: Copy OK. + * -1: Problem copying the structure. + */ +int asn_copy(const asn_TYPE_descriptor_t *td, /* ASN.1 type descriptor */ + void **struct_dst, /* Structure to be populated */ + const void *struct_src); /* Structure to be copied */ + #ifdef __cplusplus } #endif diff --git a/src/sbcap/skel/jer_decoder.h b/src/sbcap/skel/jer_decoder.h new file mode 100644 index 0000000..550cf64 --- /dev/null +++ b/src/sbcap/skel/jer_decoder.h @@ -0,0 +1,106 @@ +/*- + * Copyright (c) 2004-2017 Lev Walkin <vlm(a)lionet.info>. All rights reserved. + * Redistribution and modifications are permitted subject to BSD license. + */ +#ifndef _JER_DECODER_H_ +#define _JER_DECODER_H_ + +#include <asn_application.h> + +#ifdef __cplusplus +extern "C" { +#endif + +struct asn_TYPE_descriptor_s; /* Forward declaration */ + +/* + * The JER decoder of any ASN.1 type. May be invoked by the application. + * Decodes CANONICAL-JER and BASIC-JER. + */ +asn_dec_rval_t jer_decode( + const struct asn_codec_ctx_s *opt_codec_ctx, + const struct asn_TYPE_descriptor_s *type_descriptor, + void **struct_ptr, /* Pointer to a target structure's pointer */ + const void *buffer, /* Data to be decoded */ + size_t size /* Size of data buffer */ +); + +/* + * Type of the type-specific JER decoder function. + */ +typedef asn_dec_rval_t(jer_type_decoder_f)( + const asn_codec_ctx_t *opt_codec_ctx, + const struct asn_TYPE_descriptor_s *type_descriptor, void **struct_ptr, + const void *buf_ptr, size_t size); + +/******************************* + * INTERNALLY USEFUL FUNCTIONS * + *******************************/ + +/* + * Generalized function for decoding the primitive values. + * Used by more specialized functions, such as OCTET_STRING_decode_jer_utf8 + * and others. This function should not be used by applications, as its API + * is subject to changes. + */ +asn_dec_rval_t jer_decode_general( + const asn_codec_ctx_t *opt_codec_ctx, + asn_struct_ctx_t *ctx, /* Type decoder context */ + void *struct_key, /* Treated as opaque pointer */ + const void *buf_ptr, size_t size, + int (*opt_unexpected_tag_decoder)(void *struct_key, const void *chunk_buf, + size_t chunk_size), + ssize_t (*body_receiver)(void *struct_key, const void *chunk_buf, + size_t chunk_size, int have_more)); + + +/* + * Fetch the next JER (JSON) token from the stream. + * The function returns the number of bytes occupied by the chunk type, + * returned in the _ch_type. The _ch_type is only set (and valid) when + * the return value is >= 0. + */ +typedef enum pjer_chunk_type { + PJER_WMORE, /* Chunk type is not clear, more data expected. */ + PJER_TEXT, /* General data */ + PJER_KEY, /* Complete JSON key */ + PJER_VALUE, /* Complete JSON value */ + PJER_DLM /* JSON delimiter */ + } pjer_chunk_type_e; +ssize_t jer_next_token(int *stateContext, + const void *buffer, size_t size, pjer_chunk_type_e *_ch_type); + +/* + * This function checks the buffer for the current token or + * against the key name expected to occur. + */ +typedef enum jer_check_sym { + JCK_BROKEN, /* Something is broken */ + JCK_UNKNOWN, /* Key or delimiter is unknown */ + JCK_KEY, /* Key is OK */ + JCK_COMMA, /* Delimiter is ',' */ + JCK_OSTART, /* Delimiter is '{' */ + JCK_OEND, /* Delimiter is '}' */ + JCK_ASTART, /* Delimiter is '[' */ + JCK_AEND /* Delimiter is ']' */ +} jer_check_sym_e; +jer_check_sym_e jer_check_sym(const void *buf_ptr, int size, + const char *need_key); + +/* + * Get the number of bytes consisting entirely of JER whitespace characters. + * RETURN VALUES: + * >=0: Number of whitespace characters in the string. + */ +size_t jer_whitespace_span(const void *chunk_buf, size_t chunk_size); + +/* + * Skip the series of anticipated extensions. + */ +int jer_skip_unknown(jer_check_sym_e scv, ber_tlv_len_t *depth); + +#ifdef __cplusplus +} +#endif + +#endif /* _JER_DECODER_H_ */ diff --git a/src/sbcap/skel/jer_encoder.h b/src/sbcap/skel/jer_encoder.h index 672976d..cf8b9d2 100644 --- a/src/sbcap/skel/jer_encoder.h +++ b/src/sbcap/skel/jer_encoder.h @@ -13,15 +13,13 @@ struct asn_TYPE_descriptor_s; /* Forward declaration */ -/* Flags used by the jer_encode() and (*jer_type_encoder_f), defined below - * - * This isn't actually used, it might be used in the future to support - * both normal JSON and prettified JSON output or removed. - * It came from XER +/* + * Flags used by the jer_encode() and (*jer_type_encoder_f), defined below */ enum jer_encoder_flags_e { /* Mode of encoding */ - JER_F = 0x01, /* JER (pretty-printing) */ + JER_F = 0x01, /* JER (pretty-printing) */ + JER_F_MINIFIED = 0x02, /* JER (minified) */ }; /* @@ -30,6 +28,7 @@ */ asn_enc_rval_t jer_encode(const struct asn_TYPE_descriptor_s *type_descriptor, const void *struct_ptr, /* Structure to be encoded */ + enum jer_encoder_flags_e jer_flags, asn_app_consume_bytes_f *consume_bytes_cb, void *app_key /* Arbitrary callback argument */ ); diff --git a/src/sbcap/skel/jer_support.h b/src/sbcap/skel/jer_support.h new file mode 100644 index 0000000..556f99e --- /dev/null +++ b/src/sbcap/skel/jer_support.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2003, 2004 X/IO Labs, xiolabs.com. + * Copyright (c) 2003-2017 Lev Walkin <vlm(a)lionet.info>. All rights reserved. + * Redistribution and modifications are permitted subject to BSD license. + */ +#ifndef _JER_SUPPORT_H_ +#define _JER_SUPPORT_H_ + +#include <asn_system.h> /* Platform-specific types */ + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * Types of data transferred to the application. + */ +typedef enum { + PJSON_TEXT, + PJSON_KEY, + PJSON_VALUE, + PJSON_DLM, + /* + * The following chunk types are reported if the chunk + * terminates the specified JSON element. + */ + PJSON_KEY_END, /* Key ended */ + PJSON_VALUE_END /* Value ended */ +} pjson_chunk_type_e; + +/* + * Callback function that is called by the parser when parsed data is + * available. The _opaque is the pointer to a field containing opaque user + * data specified in pxml_create() call. The chunk type is _type and the text + * data is the piece of buffer identified by _bufid (as supplied to + * pxml_feed() call) starting at offset _offset and of _size bytes size. + * The chunk is NOT '\0'-terminated. + */ +typedef int (pjson_callback_f)(pjson_chunk_type_e _type, + const void *_chunk_data, size_t _chunk_size, void *_key); + +/* + * Parse the given buffer as it were a chunk of XML data. + * Invoke the specified callback each time the meaningful data is found. + * This function returns number of bytes consumed from the buffer. + * It will always be lesser than or equal to the specified _size. + * The next invocation of this function must account the difference. + */ +ssize_t pjson_parse(int *_stateContext, const void *_buf, size_t _size, + pjson_callback_f *cb, void *_key); + +#ifdef __cplusplus +} +#endif + +#endif /* _JER_SUPPORT_H_ */ -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/36448?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I0153ecf307c99ce904ed4632422bd9d586ec3167 Gerrit-Change-Number: 36448 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-hnbgw[master]: fix null deref on hnb_context_release

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36416?usp=email ) Change subject: fix null deref on hnb_context_release ...................................................................... fix null deref on hnb_context_release Usually, a hnb_context still has a hnb_persistent associated at release time. But that is not guaranteed. See also further below, where the function tests for ctx->persistent correctly. Change-Id: I77ddd627ebfe96c7674c6a197af8b2c4b1a4024c --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 21 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index fff900a..64bb66f 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -310,13 +310,15 @@ void hnb_context_release(struct hnb_context *ctx) { struct hnbgw_context_map *map; - struct timespec tp; - int rc; LOGHNB(ctx, DMAIN, LOGL_INFO, "Releasing HNB context\n"); - rc = osmo_clock_gettime(CLOCK_MONOTONIC, &tp); - ctx->persistent->updowntime = (rc < 0) ? 0 : tp.tv_sec; + if (ctx->persistent) { + struct timespec tp; + int rc; + rc = osmo_clock_gettime(CLOCK_MONOTONIC, &tp); + ctx->persistent->updowntime = (rc < 0) ? 0 : tp.tv_sec; + } /* remove from the list of HNB contexts */ llist_del(&ctx->list); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36416?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I77ddd627ebfe96c7674c6a197af8b2c4b1a4024c Gerrit-Change-Number: 36416 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: ignore failure to kill osmo-ggsn

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36447?usp=email ) Change subject: ttcn3-ggsn-test: ignore failure to kill osmo-ggsn ...................................................................... ttcn3-ggsn-test: ignore failure to kill osmo-ggsn Don't fail if osmo-ggsn can't be killed at the end of a testsuite run. This happens currently with ttcn3-ggsn-test-kernel-latest-* jobs, in the v6_only configurations, because osmo-ggsn latest doesn't support ipv6 yet and exits. The jenkins.sh should keep going and try other combinations, and exit without error in the end. Fixes: d8c51cce ("ttcn3-ggsn-test: run with multiple configurations") Change-Id: I6f3154a9ef114f31bcb5868ee09d1ebc10f35d07 --- M ttcn3-ggsn-test/jenkins.sh 1 file changed, 17 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/ttcn3-ggsn-test/jenkins.sh b/ttcn3-ggsn-test/jenkins.sh index f9e7a47..7c9c7ac 100755 --- a/ttcn3-ggsn-test/jenkins.sh +++ b/ttcn3-ggsn-test/jenkins.sh @@ -132,5 +132,5 @@ start_ggsn "$i" start_testsuite "$i" - docker_kill_wait "$BUILD_TAG"-ggsn + docker_kill_wait "$BUILD_TAG"-ggsn || true done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36447?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f3154a9ef114f31bcb5868ee09d1ebc10f35d07 Gerrit-Change-Number: 36447 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 4 weeks

1
0
0 0

[S] Change in osmo-trx[master]: transceiver: use log level cache

by fixeria

Attention is currently required from: Hoernchen. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/36386?usp=email ) Change subject: transceiver: use log level cache ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: `TODO-RELEASE` needs to be updated I guess? -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/36386?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Ic9f0e81c89827f2696ce046a3396f041703d6ae5 Gerrit-Change-Number: 36386 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:33:45 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: ignore failure to kill osmo-ggsn

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36447?usp=email ) Change subject: ttcn3-ggsn-test: ignore failure to kill osmo-ggsn ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36447?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f3154a9ef114f31bcb5868ee09d1ebc10f35d07 Gerrit-Change-Number: 36447 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:33:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-bts-test: use start_config functions

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36443?usp=email ) Change subject: ttcn3-bts-test: use start_config functions ...................................................................... ttcn3-bts-test: use start_config functions As suggested by Pau in code review, refactor the file to use functions for starting the testsuites, SUT and related containers with specific configurations. Related: https://gerrit.osmocom.org/c/docker-playground/+/36389/comment/67a7c35e_766… Change-Id: If3cb7dbe585c03d21e5ec6353fd25575ccac7af0 --- M ttcn3-bts-test/jenkins.sh 1 file changed, 110 insertions(+), 75 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ttcn3-bts-test/jenkins.sh b/ttcn3-bts-test/jenkins.sh index 0e9fd3e..ed4ae37 100755 --- a/ttcn3-bts-test/jenkins.sh +++ b/ttcn3-bts-test/jenkins.sh @@ -131,6 +131,98 @@ fi } +# Classic test suite with BSC for OML and trxcon+fake_trx +start_config_generic() { + if ! test_config_enabled "generic"; then + return + fi + + network_replace_subnet_in_configs + + start_bsc + start_bts trx 1 + start_fake_trx + start_trxcon + + start_testsuite generic + + docker_kill_wait ${BUILD_TAG}-trxcon + docker_kill_wait ${BUILD_TAG}-fake_trx + docker_kill_wait ${BUILD_TAG}-bts + docker_kill_wait ${BUILD_TAG}-bsc +} + +# Some GPRS tests require virt_phy +start_config_virtphy() { + if ! test_config_enabled "virtphy"; then + return + fi + + # FIXME: multicast to/from a docker bridge network is currently not possible. + # See https://github.com/moby/libnetwork/issues/2397. + set +x + echo "ERROR: not running the virtphy configuration" + exit 1 + + cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ + network_replace_subnet_in_configs + + start_bsc + start_bts virtual 0 + start_virtphy + + start_testsuite virtphy + + docker_kill_wait ${BUILD_TAG}-virtphy + docker_kill_wait ${BUILD_TAG}-bts + docker_kill_wait ${BUILD_TAG}-bsc +} + +# OML tests require us to run without BSC +start_config_oml() { + if ! test_config_enabled "oml"; then + return + fi + + cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ + network_replace_subnet_in_configs + + start_bsc + start_bts trx 1 + start_fake_trx + start_trxcon + + start_testsuite oml + + docker_kill_wait ${BUILD_TAG}-trxcon + docker_kill_wait ${BUILD_TAG}-fake_trx + docker_kill_wait ${BUILD_TAG}-bts + docker_kill_wait ${BUILD_TAG}-bsc +} + +# Frequency hopping tests require different configuration files +start_config_hopping() { + if ! test_config_enabled "hopping"; then + return + fi + + cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/ + cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ + network_replace_subnet_in_configs + + start_bsc + start_bts trx 1 + start_fake_trx + start_trxcon + + start_testsuite hopping + + docker_kill_wait ${BUILD_TAG}-trxcon + docker_kill_wait ${BUILD_TAG}-fake_trx + docker_kill_wait ${BUILD_TAG}-bsc + docker_kill_wait ${BUILD_TAG}-bts +} + network_create mkdir $VOL_BASE_DIR/bts-tester-generic @@ -170,78 +262,7 @@ mkdir $VOL_BASE_DIR/trxcon mkdir $VOL_BASE_DIR/virtphy -# 1) classic test suite with BSC for OML and trxcon+fake_trx -if test_config_enabled "generic"; then - network_replace_subnet_in_configs - - start_bsc - start_bts trx 1 - start_fake_trx - start_trxcon - - start_testsuite generic - - docker_kill_wait ${BUILD_TAG}-trxcon - docker_kill_wait ${BUILD_TAG}-fake_trx - docker_kill_wait ${BUILD_TAG}-bts - docker_kill_wait ${BUILD_TAG}-bsc -fi - -# 2) some GPRS tests require virt_phy -if test_config_enabled "virtphy"; then - # FIXME: multicast to/from a docker bridge network is currently not possible. - # See https://github.com/moby/libnetwork/issues/2397. - set +x - echo "ERROR: not running the virtphy configuration" - exit 1 - - cp virtphy/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ - network_replace_subnet_in_configs - - start_bsc - start_bts virtual 0 - start_virtphy - - start_testsuite virtphy - - docker_kill_wait ${BUILD_TAG}-virtphy - docker_kill_wait ${BUILD_TAG}-bts - docker_kill_wait ${BUILD_TAG}-bsc -fi - -# 3) OML tests require us to run without BSC -if test_config_enabled "oml"; then - cp oml/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ - network_replace_subnet_in_configs - - start_bsc - start_bts trx 1 - start_fake_trx - start_trxcon - - start_testsuite oml - - docker_kill_wait ${BUILD_TAG}-trxcon - docker_kill_wait ${BUILD_TAG}-fake_trx - docker_kill_wait ${BUILD_TAG}-bts - docker_kill_wait ${BUILD_TAG}-bsc -fi - -# 4) Frequency hopping tests require different configuration files -if test_config_enabled "hopping"; then - cp fh/osmo-bsc.gen.cfg $VOL_BASE_DIR/bsc/ - cp generic/osmo-bts.gen.cfg $VOL_BASE_DIR/bts/ - network_replace_subnet_in_configs - - start_bsc - start_bts trx 1 - start_fake_trx - start_trxcon - - start_testsuite hopping - - docker_kill_wait ${BUILD_TAG}-trxcon - docker_kill_wait ${BUILD_TAG}-fake_trx - docker_kill_wait ${BUILD_TAG}-bsc - docker_kill_wait ${BUILD_TAG}-bts -fi +start_config_generic +start_config_virtphy +start_config_oml +start_config_hopping -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36443?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3cb7dbe585c03d21e5ec6353fd25575ccac7af0 Gerrit-Change-Number: 36443 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 4 weeks

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-bts-test: use start_config functions

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36443?usp=email ) Change subject: ttcn3-bts-test: use start_config functions ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36443?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If3cb7dbe585c03d21e5ec6353fd25575ccac7af0 Gerrit-Change-Number: 36443 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:29:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-bts-test: add env var to not run all configs

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36389?usp=email ) Change subject: ttcn3-bts-test: add env var to not run all configs ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: Very nice idea! -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36389?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I1dce5e6aa4b5d67f9f8c96ced611ab2875c353c8 Gerrit-Change-Number: 36389 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:28:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... ttcn3-bts-test: abort if missing osmo-config-merge Change-Id: I9cea4affac0b3981c88078581a070f98649da667 --- M ttcn3-bts-test/Makefile 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/ttcn3-bts-test/Makefile b/ttcn3-bts-test/Makefile index a6fc200..fc6f3f8 100644 --- a/ttcn3-bts-test/Makefile +++ b/ttcn3-bts-test/Makefile @@ -12,8 +12,10 @@ oml/osmo-bts.gen.cfg \ fh/osmo-bsc.gen.cfg -.PHONY: cfg -cfg: $(CFG_SRC_FILES) $(CFG_GEN_FILES) +.PHONY: req-osmo-config-merge cfg +req-osmo-config-merge: + command -v osmo-config-merge +cfg: req-osmo-config-merge $(CFG_SRC_FILES) $(CFG_GEN_FILES) # Ensure that we always fetch up-to-date configuration files. # See https://www.gnu.org/software/make/manual/make.html#Force-Targets -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:20:41 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 2: (1 comment) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/36446/comment/a526dd70_f0f… PS1, Line 15: cfg req-osmo-config-merge > well, it is also allowed without having it in PHONY. The only thing it does, is that if you do: […] s/make osmo-config-merge/make req-osmo-config-merge/, you know what I mean :) -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:20:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 2: (1 comment) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/36446/comment/0e858517_f2b… PS1, Line 15: cfg req-osmo-config-merge > Ah, indeed. So by doing this you allow the user to do: […] well, it is also allowed without having it in PHONY. The only thing it does, is that if you do: ``` $ touch req-osmo-config-merge $ make osmo-config-merge ``` Then make knows it isn't a real target and it should run anyway, even though the file with the name of the target exists. It's good practice to put it there, for our use case it doesn't make a difference. But since we also have cfg there I put it there as well. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:19:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:17:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 2: (1 comment) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/36446/comment/2efea17b_75a… PS1, Line 15: cfg req-osmo-config-merge > Done Ah, indeed. So by doing this you allow the user to do: ``` make req-osmo-config-merge ``` Not sure how and when would this be useful, but not blocking. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:17:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by pespin

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:15:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-bts-test: abort if missing osmo-config-merge

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email ) Change subject: ttcn3-bts-test: abort if missing osmo-config-merge ...................................................................... Patch Set 2: (2 comments) File ttcn3-bts-test/Makefile: https://gerrit.osmocom.org/c/docker-playground/+/36446/comment/d6e69348_716… PS1, Line 15: .PHONY: cfg req-osmo-config-merge > Shouldn't req-osmo-config-merge be put before calling it through cfg? Done https://gerrit.osmocom.org/c/docker-playground/+/36446/comment/4a9ff1eb_b2d… PS1, Line 15: cfg req-osmo-config-merge > PHONY only means that these are not real targets. […] Done -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I9cea4affac0b3981c88078581a070f98649da667 Gerrit-Change-Number: 36446 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:14:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

[S] Change in docker-playground[master]: ttcn3-ggsn-test: ignore failure to kill osmo-ggsn

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/36447?usp=email ) Change subject: ttcn3-ggsn-test: ignore failure to kill osmo-ggsn ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/36447?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f3154a9ef114f31bcb5868ee09d1ebc10f35d07 Gerrit-Change-Number: 36447 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Mar 2024 13:14:02 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 months, 4 weeks

1
0
0 0

2024

2023

2022

gerrit-log March 2024