October 2022 - gerrit-log - lists.osmocom.org

Change in osmo-gbproxy[master]: gbproxy_vty: Add commands to list Cell/BVC of an NSE

by daniel

Attention is currently required from: msuraev, lynxis lazus. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 ) Change subject: gbproxy_vty: Add commands to list Cell/BVC of an NSE ...................................................................... Patch Set 2: (1 comment) File src/gb_proxy_vty.c: https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714/comment/5d496b7e_b23bf68a PS2, Line 543: int i; > Would be better to use "unsigned" or "size_t" for i: it's iterated from 0 and used as array index in […] I don't completely disagree, but in the macro bkt is initialized to 0 and checked against ARRAY_SIZE of the array. So as long as the array will not use more than 2^31 elements this shouldn't matter in practice. int is also used in hash_for_each loops in several existing functions (above and below). Let's leave this patch as-is, if you want you could provide a follow-up patch changing all occurrences. -- To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/29714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gbproxy Gerrit-Branch: master Gerrit-Change-Id: I10c6d3f59681ec6dc98f1a3b023af446cc2a1c12 Gerrit-Change-Number: 29714 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 14 Oct 2022 14:41:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: jenkins-gerrit: add link to retrigger the build

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29756 ) Change subject: jenkins-gerrit: add link to retrigger the build ...................................................................... jenkins-gerrit: add link to retrigger the build It's useful to be able to retrigger the pipeline, for example if the build failed because a depending patch was not merged yet and later it is merged. Add the link where the "Retrigger" button is to make this convenient. Related: OS#2385 Change-Id: I647efac9e79d755282b78f14bd27244c99ef7f11 --- M scripts/jenkins-gerrit/pipeline_summary.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved diff --git a/scripts/jenkins-gerrit/pipeline_summary.py b/scripts/jenkins-gerrit/pipeline_summary.py index b5310c6..a47ab7c 100755 --- a/scripts/jenkins-gerrit/pipeline_summary.py +++ b/scripts/jenkins-gerrit/pipeline_summary.py @@ -164,6 +164,8 @@ summary += "\n" if jobs["failed"]: summary += "Build Failed\n" + summary += "\n" + summary += f"Find the Retrigger button here:\n{build_url}\n" vote = -1 notify = "OWNER" else: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I647efac9e79d755282b78f14bd27244c99ef7f11 Gerrit-Change-Number: 29756 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: jenkins-gerrit: add link to retrigger the build

by daniel

Attention is currently required from: osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29756 ) Change subject: jenkins-gerrit: add link to retrigger the build ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I647efac9e79d755282b78f14bd27244c99ef7f11 Gerrit-Change-Number: 29756 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Oct 2022 14:38:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: jenkins-gerrit: add link to retrigger the build

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29756 ) Change subject: jenkins-gerrit: add link to retrigger the build ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I647efac9e79d755282b78f14bd27244c99ef7f11 Gerrit-Change-Number: 29756 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: Fri, 14 Oct 2022 14:37:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: Use GSM48_MT_RR_IMM_ASS instead of hardcoded 0x3f value

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29757 ) Change subject: Use GSM48_MT_RR_IMM_ASS instead of hardcoded 0x3f value ...................................................................... Use GSM48_MT_RR_IMM_ASS instead of hardcoded 0x3f value Change-Id: Id966cbab403763d006bd5e59757c5bf57402bf9d --- M src/encoding.cpp M src/pcu_l1_if.cpp M tests/types/TypesTest.cpp 3 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/57/29757/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index 614955b..a91b399 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -447,7 +447,7 @@ bitvec_write_field(dest, &wp, 0x0, 4); // Skip Indicator bitvec_write_field(dest, &wp, 0x6, 4); // Protocol Discriminator - bitvec_write_field(dest, &wp, 0x3F, 8); // Immediate Assignment Message Type + bitvec_write_field(dest, &wp, GSM48_MT_RR_IMM_ASS, 8); // Immediate Assignment Message Type // 10.5.2.25b Dedicated mode or TBF bitvec_write_field(dest, &wp, 0x0, 1); // spare diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 67e4de5..f964b78 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -510,7 +510,7 @@ switch (data_cnf->sapi) { case PCU_IF_SAPI_PCH: - if (data_cnf->data[2] == 0x3f) + if (data_cnf->data[2] == GSM48_MT_RR_IMM_ASS) bts_rcv_imm_ass_cnf(bts, data_cnf->data, data_cnf->fn); break; default: diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index c497d07..90244dd 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -781,7 +781,7 @@ struct gprs_rlcmac_tbf *tbf = tbf_alloc_dl_tbf(bts, ms, 0, false); static uint8_t res[] = { 0x06, - 0x3f, /* Immediate Assignment Message Type */ + 0x3f, /* Immediate Assignment Message Type (GSM48_MT_RR_IMM_ASS) */ 0x30, /* §10.5.2.26 Page Mode and §10.5.2.25b Dedicated mode/TBF */ 0x0d, 0x23, 0x6d, /* §10.5.2.25a Packet Channel Description */ /* ETSI TS 44.018 §10.5.2.30 Request Reference */ @@ -806,7 +806,7 @@ GprsMs *ms = bts_alloc_ms(bts, 1, 0); struct gprs_rlcmac_tbf *tbf = tbf_alloc_ul_tbf(bts, ms, 0, false); static uint8_t res[] = { 0x06, - 0x3f, /* Immediate Assignment Message Type */ + 0x3f, /* Immediate Assignment Message Type (GSM48_MT_RR_IMM_ASS) */ 0x10, /* §10.5.2.26 Page Mode and §10.5.2.25b Dedicated mode/TBF */ 0x0d, 0x23, 0x6d, /* §10.5.2.25a Packet Channel Description */ /* ETSI TS 44.018 §10.5.2.30 Request Reference */ @@ -824,7 +824,7 @@ void test_immediate_assign_ul0s() { static uint8_t res[] = { 0x06, - 0x3f, /* Immediate Assignment Message Type */ + 0x3f, /* Immediate Assignment Message Type (GSM48_MT_RR_IMM_ASS) */ 0x10, /* §10.5.2.26 Page Mode and §10.5.2.25b Dedicated mode/TBF */ 0x0d, 0x23, 0x6d, /* §10.5.2.25a Packet Channel Description */ /* ETSI TS 44.018 §10.5.2.30 Request Reference */ @@ -848,7 +848,7 @@ GprsMs *ms = bts_alloc_ms(bts, 1, 1); struct gprs_rlcmac_tbf *tbf = tbf_alloc_ul_tbf(bts, ms, 0, false); static uint8_t res[] = { 0x06, - 0x3f, /* Immediate Assignment Message Type */ + 0x3f, /* Immediate Assignment Message Type (GSM48_MT_RR_IMM_ASS) */ 0x10, /* §10.5.2.26 Page Mode and §10.5.2.25b Dedicated mode/TBF */ 0x0d, 0x23, 0x6d, /* §10.5.2.25a Packet Channel Description */ /* ETSI TS 44.018 §10.5.2.30 Request Reference */ @@ -866,7 +866,7 @@ void test_immediate_assign_ul1m() { static uint8_t res[] = { 0x06, - 0x3f, /* Immediate Assignment Message Type */ + 0x3f, /* Immediate Assignment Message Type (GSM48_MT_RR_IMM_ASS) */ 0x10, /* §10.5.2.26 Page Mode and §10.5.2.25b Dedicated mode/TBF */ 0x0d, 0x23, 0x6d, /* §10.5.2.25a Packet Channel Description */ /* ETSI TS 44.018 §10.5.2.30 Request Reference */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id966cbab403763d006bd5e59757c5bf57402bf9d Gerrit-Change-Number: 29757 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-ci[master]: jenkins-gerrit: add link to retrigger the build

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29756 ) Change subject: jenkins-gerrit: add link to retrigger the build ...................................................................... jenkins-gerrit: add link to retrigger the build It's useful to be able to retrigger the pipeline, for example if the build failed because a depending patch was not merged yet and later it is merged. Add the link where the "Retrigger" button is to make this convenient. Related: OS#2385 Change-Id: I647efac9e79d755282b78f14bd27244c99ef7f11 --- M scripts/jenkins-gerrit/pipeline_summary.py 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/56/29756/1 diff --git a/scripts/jenkins-gerrit/pipeline_summary.py b/scripts/jenkins-gerrit/pipeline_summary.py index b5310c6..a47ab7c 100755 --- a/scripts/jenkins-gerrit/pipeline_summary.py +++ b/scripts/jenkins-gerrit/pipeline_summary.py @@ -164,6 +164,8 @@ summary += "\n" if jobs["failed"]: summary += "Build Failed\n" + summary += "\n" + summary += f"Find the Retrigger button here:\n{build_url}\n" vote = -1 notify = "OWNER" else: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I647efac9e79d755282b78f14bd27244c99ef7f11 Gerrit-Change-Number: 29756 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-pcu[master]: cosmetic: Add missing spacing between params

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29755 ) Change subject: cosmetic: Add missing spacing between params ...................................................................... cosmetic: Add missing spacing between params Change-Id: I45666ed52d15871b83aaca1d7cb3e521800751c2 --- M src/encoding.cpp 1 file changed, 11 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/55/29755/1 diff --git a/src/encoding.cpp b/src/encoding.cpp index f552111..614955b 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -445,17 +445,17 @@ int plen; int rc; - bitvec_write_field(dest, &wp,0x0,4); // Skip Indicator - bitvec_write_field(dest, &wp,0x6,4); // Protocol Discriminator - bitvec_write_field(dest, &wp,0x3F,8); // Immediate Assignment Message Type + bitvec_write_field(dest, &wp, 0x0, 4); // Skip Indicator + bitvec_write_field(dest, &wp, 0x6, 4); // Protocol Discriminator + bitvec_write_field(dest, &wp, 0x3F, 8); // Immediate Assignment Message Type // 10.5.2.25b Dedicated mode or TBF - bitvec_write_field(dest, &wp,0x0,1); // spare - bitvec_write_field(dest, &wp,0x0,1); // TMA : Two-message assignment: No meaning - bitvec_write_field(dest, &wp,downlink,1); // Downlink : Downlink assignment to mobile in packet idle mode - bitvec_write_field(dest, &wp,0x1,1); // T/D : TBF or dedicated mode: this message assigns a Temporary Block Flow (TBF). + bitvec_write_field(dest, &wp, 0x0, 1); // spare + bitvec_write_field(dest, &wp, 0x0, 1); // TMA : Two-message assignment: No meaning + bitvec_write_field(dest, &wp, downlink, 1); // Downlink : Downlink assignment to mobile in packet idle mode + bitvec_write_field(dest, &wp, 0x1, 1); // T/D : TBF or dedicated mode: this message assigns a Temporary Block Flow (TBF). - bitvec_write_field(dest, &wp,0x0,4); // Page Mode + bitvec_write_field(dest, &wp, 0x0, 4); // Page Mode // GSM 04.08 10.5.2.25a Packet Channel Description bitvec_write_field(dest, &wp, 0x01, 5); // Channel type @@ -480,9 +480,9 @@ bitvec_write_field(dest, &wp, ra, 8); /* RACH value */ } - bitvec_write_field(dest, &wp,(ref_fn / (26 * 51)) % 32,5); // T1' - bitvec_write_field(dest, &wp,ref_fn % 51,6); // T3 - bitvec_write_field(dest, &wp,ref_fn % 26,5); // T2 + bitvec_write_field(dest, &wp,(ref_fn / (26 * 51)) % 32, 5); // T1' + bitvec_write_field(dest, &wp,ref_fn % 51, 6); // T3 + bitvec_write_field(dest, &wp,ref_fn % 26, 5); // T2 // 10.5.2.40 Timing Advance bitvec_write_field(dest, &wp,0x0,2); // spare -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I45666ed52d15871b83aaca1d7cb3e521800751c2 Gerrit-Change-Number: 29755 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: delete CHAN RQD from queue when rach ind was sent

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29705 ) Change subject: abis_rsl: delete CHAN RQD from queue when rach ind was sent ...................................................................... abis_rsl: delete CHAN RQD from queue when rach ind was sent The CHAN REQ entry is not deleted after its information was passed on to the PCU. This causes the same entry to be used over and over again while blocking other incoming CHAN RQD. Change-Id: Ia4abc55fc6fcb1c00991cc84d09529131d014910 Related: OS#5198 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 3b83b0e..304e95c 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2147,8 +2147,8 @@ /* Handle PDCH related rach requests (in case of BSC-co-located-PCU) */ if (rqd->reason == GSM_CHREQ_REASON_PDCH) { - rsl_rx_pchan_rqd(rqd); - return; + if (rsl_rx_pchan_rqd(rqd) == 0) + goto leave; } /* Ensure that emergency calls will get priority over regular calls, however releasing @@ -2234,6 +2234,8 @@ }; lchan_activate(lchan, &info); + +leave: llist_del(&rqd->entry); talloc_free(rqd); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia4abc55fc6fcb1c00991cc84d09529131d014910 Gerrit-Change-Number: 29705 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: delete CHAN RQD from queue when rach ind was sent

by pespin

Attention is currently required from: msuraev, lynxis lazus, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29705 ) Change subject: abis_rsl: delete CHAN RQD from queue when rach ind was sent ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia4abc55fc6fcb1c00991cc84d09529131d014910 Gerrit-Change-Number: 29705 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Oct 2022 14:12:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: show full request reference in log

by pespin

Attention is currently required from: laforge, fixeria, lynxis lazus, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29703 ) Change subject: abis_rsl: show full request reference in log ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: I have no real concern regarding T1,T2,T3, letting others which may make use of it have someting to say (I find FNs much more easy to follow). -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I78499b49ae176b736e384e193fadc0bdd669dffa Gerrit-Change-Number: 29703 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Oct 2022 14:11:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022