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

[S] Change in libosmo-gprs[master]: gmm: Implement GMMR-PAGE.ind

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32982 to look at the new patch set (#4). Change subject: gmm: Implement GMMR-PAGE.ind ...................................................................... gmm: Implement GMMR-PAGE.ind Submit an LLGM-TRIGGER.req as described in TS 24.007 C.13. Change-Id: Iba77b4a5280ce08f099f4e15934fa92d4ba8ba10 --- M src/gmm/gmm_prim.c M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.err M tests/gmm/gmm_prim_test.ok 4 files changed, 44 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/82/32982/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32982 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Iba77b4a5280ce08f099f4e15934fa92d4ba8ba10 Gerrit-Change-Number: 32982 Gerrit-PatchSet: 4 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-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotific...

by pespin

Attention is currently required from: laforge, fixeria, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995 ) Change subject: RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotification ...................................................................... Patch Set 1: (3 comments) File library/RLCMAC_CSN1_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/330ac55e_0e70… PS1, Line 166: utran_target_cell_presence := omit, > I am bit surprised that non present optional fields must not be unbound. […] the PRESENCE is used during decoding, not during encoding afaik. I guess this allows generating incorrect messages on purpose for testing purposes? File library/RLCMAC_CSN1_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/616d850c_9d2d… PS1, Line 1016: BIT1 ba_psi3_presence, Add a /* TODO: Rel-8 addition */ here https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/5d537756_897e… PS1, Line 1030: variant (utran_target_cell) "PRESENCE(arfcn_bsic_presence = '1'B, utran_target_cell_presence = '0'B)" > This describes the escape bit mechanism: […] I think it may make sense to have the ARFCN+BSIC CSN.1 struct as a record here, it would simplify a bit this imho. Also, you may want to have a look at TAG, it may be clearer here, since in here it's not really about optional fields, but about taking one or another substruct. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995 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: I4e1c63c06fb89111765df187a93db563e77c3fc4 Gerrit-Change-Number: 32995 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: 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: Thu, 25 May 2023 13:43:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: llc: Implement LLGM-TRIGGER.req

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32983 to look at the new patch set (#3). Change subject: llc: Implement LLGM-TRIGGER.req ...................................................................... llc: Implement LLGM-TRIGGER.req Change-Id: Id1af5912f407fe055a59a4bb217936307697975f --- M include/osmocom/gprs/llc/llc_prim.h M include/osmocom/gprs/llc/llc_private.h M src/llc/llc.c M src/llc/llc_llgmm.c M tests/llc/llc_prim_test.c M tests/llc/llc_prim_test.err M tests/llc/llc_prim_test.ok 7 files changed, 130 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/83/32983/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32983 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Id1af5912f407fe055a59a4bb217936307697975f Gerrit-Change-Number: 32983 Gerrit-PatchSet: 3 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-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: Fix typo llgm -> llgmm everywhere

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32996 ) Change subject: Fix typo llgm -> llgmm everywhere ...................................................................... Fix typo llgm -> llgmm everywhere Change-Id: Ic9cd63a6086526efdbd9184729bfae4b1cea56c1 --- M include/osmocom/gprs/llc/llc_prim.h M src/gmm/gmm.c M src/gmm/gmm_ms_fsm.c M src/llc/llc_llgmm.c M tests/llc/llc_prim_test.c 5 files changed, 33 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/96/32996/1 diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index 904e9fa..d675954 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -298,11 +298,11 @@ const char *osmo_gprs_llc_prim_name(const struct osmo_gprs_llc_prim *llc_prim); /* Alloc primitive for LLGMM SAP: */ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_assign_req(uint32_t tlli); -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_reset_req(uint32_t tlli); -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_trigger_req(uint32_t tlli, uint8_t cause); -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_suspend_req(uint32_t tlli); -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_resume_req(uint32_t tlli); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_assign_req(uint32_t tlli); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_reset_req(uint32_t tlli); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_trigger_req(uint32_t tlli, uint8_t cause); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_suspend_req(uint32_t tlli); +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_resume_req(uint32_t tlli); /* Alloc primitive for LL SAP: */ struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_ll_establish_req(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index 38ebc98..f59147b 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -469,7 +469,7 @@ struct osmo_gprs_llc_prim *llc_prim_tx; int rc; - llc_prim_tx = osmo_gprs_llc_prim_alloc_llgm_assign_req(gmme->old_tlli); + llc_prim_tx = osmo_gprs_llc_prim_alloc_llgmm_assign_req(gmme->old_tlli); llc_prim_tx->llgmm.assign_req.tlli_new = gmme->tlli; llc_prim_tx->llgmm.assign_req.gea = gmme->auth_ciph.gea; memcpy(llc_prim_tx->llgmm.assign_req.kc, gmme->auth_ciph.kc, ARRAY_SIZE(gmme->auth_ciph.kc)); diff --git a/src/gmm/gmm_ms_fsm.c b/src/gmm/gmm_ms_fsm.c index a6714ff..95e421b 100644 --- a/src/gmm/gmm_ms_fsm.c +++ b/src/gmm/gmm_ms_fsm.c @@ -191,7 +191,7 @@ break; case GPRS_GMM_MS_EV_RAU_REQUESTED: /* TS 24.007 C.15: submit LLGMM-SUSPEND-REQ */ - llc_prim_tx = osmo_gprs_llc_prim_alloc_llgm_suspend_req(ctx->gmme->tlli); + llc_prim_tx = osmo_gprs_llc_prim_alloc_llgmm_suspend_req(ctx->gmme->tlli); OSMO_ASSERT(llc_prim_tx); rc = gprs_gmm_prim_call_llc_down_cb(llc_prim_tx); /* Transmit RAU Requested to SGSN: */ @@ -238,7 +238,7 @@ break; case GPRS_GMM_MS_EV_RAU_ACCEPTED: /* TS 24.007 C.15: submit LLGM-RESUME-REQ */ - llc_prim_tx = osmo_gprs_llc_prim_alloc_llgm_resume_req(ctx->gmme->tlli); + llc_prim_tx = osmo_gprs_llc_prim_alloc_llgmm_resume_req(ctx->gmme->tlli); OSMO_ASSERT(llc_prim_tx); gprs_gmm_prim_call_llc_down_cb(llc_prim_tx); gmm_ms_fsm_state_chg(fi, GPRS_GMM_MS_ST_REGISTERED); diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c index 7b09a69..bf161e3 100644 --- a/src/llc/llc_llgmm.c +++ b/src/llc/llc_llgmm.c @@ -83,7 +83,7 @@ } /* 7.2.1.1 LLGMM-ASSIGN.req (MS/SGSN):*/ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_assign_req(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_assign_req(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_ASSIGN, PRIM_OP_REQUEST, 0); @@ -92,7 +92,7 @@ } /* 7.2.1.2 LLGMM-RESET.req (SGSN):*/ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_reset_req(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_reset_req(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_RESET, PRIM_OP_REQUEST, 0); @@ -101,7 +101,7 @@ } /* 7.2.1.2 LLGMM-RESET.cnf (SGSN): */ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_reset_cnf(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_reset_cnf(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_RESET, PRIM_OP_CONFIRM, 0); @@ -110,7 +110,7 @@ } /* 7.2.1.3 LLGMM-TRIGGER.req (MS): */ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_trigger_req(uint32_t tlli, uint8_t cause) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_trigger_req(uint32_t tlli, uint8_t cause) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_TRIGGER, PRIM_OP_REQUEST, 0); @@ -120,7 +120,7 @@ } /* 7.2.1.4 LLGMM-SUSPEND.req (MS/SGSN): */ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_suspend_req(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_suspend_req(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_SUSPEND, PRIM_OP_REQUEST, 0); @@ -129,7 +129,7 @@ } /* 7.2.1.5 LLGMM-RESUME.req (MS/SGSN):*/ -struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgm_resume_req(uint32_t tlli) +struct osmo_gprs_llc_prim *osmo_gprs_llc_prim_alloc_llgmm_resume_req(uint32_t tlli) { struct osmo_gprs_llc_prim *llc_prim; llc_prim = llc_prim_llgmm_alloc(OSMO_GPRS_LLC_LLGMM_RESUME, PRIM_OP_REQUEST, 0); @@ -142,7 +142,7 @@ ********************************/ /* 7.2.1.1 LLGMM-ASSIGN.req (MS/SGSN):*/ -static int llc_prim_handle_llgm_assign_req(struct osmo_gprs_llc_prim *llc_prim) +static int llc_prim_handle_llgmm_assign_req(struct osmo_gprs_llc_prim *llc_prim) { uint32_t old_tlli = llc_prim->llgmm.tlli; uint32_t new_tlli = llc_prim->llgmm.assign_req.tlli_new; @@ -228,7 +228,7 @@ } /* 7.2.1.2 LLGMM-RESET.req (SGSN):*/ -static int llc_prim_handle_llgm_reset_req(struct osmo_gprs_llc_prim *llc_prim) +static int llc_prim_handle_llgmm_reset_req(struct osmo_gprs_llc_prim *llc_prim) { struct gprs_llc_lle *lle; uint8_t xid_bytes[1024]; @@ -275,7 +275,7 @@ } /* 7.2.1.4 LLGMM-SUSPEND.req (MS/SGSN):*/ -static int llc_prim_handle_llgm_suspend_req(struct osmo_gprs_llc_prim *llc_prim) +static int llc_prim_handle_llgmm_suspend_req(struct osmo_gprs_llc_prim *llc_prim) { int rc = 0; struct gprs_llc_llme *llme = gprs_llc_find_llme_by_tlli(llc_prim->llgmm.tlli); @@ -296,7 +296,7 @@ } /* 7.2.1.5 LLGMM-RESUME.req (MS/SGSN):*/ -static int llc_prim_handle_llgm_resume_req(struct osmo_gprs_llc_prim *llc_prim) +static int llc_prim_handle_llgmm_resume_req(struct osmo_gprs_llc_prim *llc_prim) { int rc = 0; struct gprs_llc_llme *llme = gprs_llc_find_llme_by_tlli(llc_prim->llgmm.tlli); @@ -324,11 +324,11 @@ case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_ASSIGN, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); - rc = llc_prim_handle_llgm_assign_req(llc_prim); + rc = llc_prim_handle_llgmm_assign_req(llc_prim); break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_RESET, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); - rc = llc_prim_handle_llgm_reset_req(llc_prim); + rc = llc_prim_handle_llgmm_reset_req(llc_prim); break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_TRIGGER, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS); @@ -337,12 +337,12 @@ case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_SUSPEND, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); - rc = llc_prim_handle_llgm_suspend_req(llc_prim); + rc = llc_prim_handle_llgmm_suspend_req(llc_prim); break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_RESUME, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); - rc = llc_prim_handle_llgm_resume_req(llc_prim); + rc = llc_prim_handle_llgmm_resume_req(llc_prim); break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_IOV, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN); diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c index 54dabb6..b3ff512 100644 --- a/tests/llc/llc_prim_test.c +++ b/tests/llc/llc_prim_test.c @@ -219,13 +219,13 @@ rc = osmo_gprs_llc_prim_upper_down(llc_prim); OSMO_ASSERT(rc == 0); - llc_prim = osmo_gprs_llc_prim_alloc_llgm_assign_req(tlli); + llc_prim = osmo_gprs_llc_prim_alloc_llgmm_assign_req(tlli); OSMO_ASSERT(llc_prim); llc_prim->llgmm.assign_req.tlli_new = tlli; rc = osmo_gprs_llc_prim_upper_down(llc_prim); OSMO_ASSERT(rc == 0); - llc_prim = osmo_gprs_llc_prim_alloc_llgm_reset_req(tlli); + llc_prim = osmo_gprs_llc_prim_alloc_llgmm_reset_req(tlli); OSMO_ASSERT(llc_prim); rc = osmo_gprs_llc_prim_upper_down(llc_prim); OSMO_ASSERT(rc == 0); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic9cd63a6086526efdbd9184729bfae4b1cea56c1 Gerrit-Change-Number: 32996 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotific...

by dexter

Attention is currently required from: laforge, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995 ) Change subject: RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotification ...................................................................... Patch Set 1: (3 comments) Patchset: PS1: Please have a critical look at the CSN.1 description and my implementation as TTCN3 record. For the Matrioshka I found examples to orient myself on but for the escape bit mechanism (arfcn, bsic, utran_target_cell) I couldn't find any example. Also variable length field reporting_quantity in UtranCCNMesurementReport was a bit challenging. File library/RLCMAC_CSN1_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/753109b4_7dd2… PS1, Line 166: utran_target_cell_presence := omit, I am bit surprised that non present optional fields must not be unbound. Shouldn't TTCN3 know by the variant/PRESENCE description know if the field is there or not? File library/RLCMAC_CSN1_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/14136ecb_6726… PS1, Line 1030: variant (utran_target_cell) "PRESENCE(arfcn_bsic_presence = '1'B, utran_target_cell_presence = '0'B)" This describes the escape bit mechanism: 0 arfcn, bsic 10 utran_target_cell 110 (4G extensions, to be added later) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995 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: I4e1c63c06fb89111765df187a93db563e77c3fc4 Gerrit-Change-Number: 32995 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 May 2023 13:24:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotific...

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995 ) Change subject: RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotification ...................................................................... RLCMAC_CSN1_Types: Add release 6 additions to PacketCellChangeNotification The PacketCellChangeNotification type currently lacks the release 6 additions. Those basically add 3G compatibility to the PacketCellChangeNotification message type. Spec reference: 3gpp TS 44.060 11.2.3a Related: OS#6044 Change-Id: I4e1c63c06fb89111765df187a93db563e77c3fc4 --- M library/RLCMAC_CSN1_Templates.ttcn M library/RLCMAC_CSN1_Types.ttcn 2 files changed, 79 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/32995/1 diff --git a/library/RLCMAC_CSN1_Templates.ttcn b/library/RLCMAC_CSN1_Templates.ttcn index 943717e..34abb73 100644 --- a/library/RLCMAC_CSN1_Templates.ttcn +++ b/library/RLCMAC_CSN1_Templates.ttcn @@ -163,14 +163,17 @@ tfi := tfi }, arfcn_bsic_presence := '0'B, + utran_target_cell_presence := omit, arfcn := arfcn, bsic := bsic, + utran_target_cell := omit, ba_psi3_presence := '0'B, ba_used := '0'B, psi3_change_mark := omit, pmo_used := '0'B, pccn_sending := '0'B, - ccn_meas_rep := ccn_meas_rep + ccn_meas_rep := ccn_meas_rep, + rel_additions := omit } } }; diff --git a/library/RLCMAC_CSN1_Types.ttcn b/library/RLCMAC_CSN1_Types.ttcn index 2093f55..161fc5c 100644 --- a/library/RLCMAC_CSN1_Types.ttcn +++ b/library/RLCMAC_CSN1_Types.ttcn @@ -941,7 +941,38 @@ variant (sign_var) "PRESENCE(sign_var_presence = '1'B)" }; - /* 11.2.3a Packet Cell Change Notification */ + /* 11.2.3a Packet Cell Change Notification, 3G Target Cell Struct (Rel-6 extension) */ + type record UtranTargetCell { + BIT1 fdd_arfcn_presence, + uint14_t fdd_arfcn optional, + BIT1 bandwith_fdd_presence, + uint3_t bandwith_fdd optional, + uint10_t scrambling_code, + BIT1 tdd_arfcn_presence, + uint14_t tdd_arfcn optional, + BIT1 bandwith_tdd_presence, + uint3_t bandwith_tdd optional, + uint7_t cell_parameter, + uint1_t sync_case, + uint6_t reporting_quantity + } with { + variant (fdd_arfcn) "PRESENCE(fdd_arfcn_presence = '1'B)" + variant (bandwith_fdd) "PRESENCE(bandwith_fdd_presence = '1'B)" + variant (tdd_arfcn) "PRESENCE(tdd_arfcn_presence = '1'B)" + variant (bandwith_tdd) "PRESENCE(bandwith_tdd_presence = '1'B)" + }; + + /* 11.2.3a Packet Cell Change Notification, 3G CCN Measurement Report Struct (Rel-6 extension) */ + type record of uint6_t ReportingQuantityList; + type record UtranCCNMesurementReport { + uint3_t n_3g, + uint7_t utran_cell_list_index, + ReportingQuantityList reporting_quantity + } with { + variant (n_3g) "LENGTHTO(reporting_quantity)" + variant (n_3g) "UNIT(elements)" + }; + type record NCMeasurementItem { uint6_t freq, BIT1 bsic_presence, @@ -957,22 +988,47 @@ uint3_t num_meas, NCMeasurements meas } with { variant "" }; + + /* 11.2.3a Packet Cell Change Notification, Rel-Additions (Matrioshka) */ + private type record PktCellChgNotifAdditions { + BIT1 rel6_presence, + PktCellChgNotifR6Additions rel6 optional + } with { + variant (rel6) "PRESENCE(rel6_presence = '1'B)" + }; + private type record PktCellChgNotifR6Additions { + BIT1 utran_ba_used_presence, + uint1_t utran_ba_used, + UtranCCNMesurementReport utran_ccn_meas_rep + } with { + variant (utran_ba_used) "PRESENCE(utran_ba_used_presence = '1'B)" + }; + + /* 11.2.3a Packet Cell Change Notification, message body */ type record PacketCellChangeNotification { GlobalTfi gtfi, /* TODO: support 3g/4g in these bits */ BIT1 arfcn_bsic_presence, + BIT1 utran_target_cell_presence optional, /* Rel-6 addition */ uint10_t arfcn optional, uint6_t bsic optional, + UtranTargetCell utran_target_cell optional, /* Rel-6 addition */ BIT1 ba_psi3_presence, BIT1 ba_used optional, BIT2 psi3_change_mark optional, BIT1 pmo_used, BIT1 pccn_sending, - CCNMesurementReport ccn_meas_rep - /* TODO: Rel6 additions for 3G support */ + CCNMesurementReport ccn_meas_rep, + /* Rel-Additions (Matrioshka) */ + PktCellChgNotifAdditions rel_additions optional } with { variant (arfcn) "PRESENCE(arfcn_bsic_presence = '0'B)" variant (bsic) "PRESENCE(arfcn_bsic_presence = '0'B)" + + /* Rel-6 addition */ + variant (utran_target_cell_presence) "PRESENCE(arfcn_bsic_presence = '1'B)" + variant (utran_target_cell) "PRESENCE(arfcn_bsic_presence = '1'B, utran_target_cell_presence = '0'B)" + variant (ba_used) "PRESENCE(ba_psi3_presence = '0'B)" variant (psi3_change_mark) "PRESENCE(ba_psi3_presence = '1'B)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995 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: I4e1c63c06fb89111765df187a93db563e77c3fc4 Gerrit-Change-Number: 32995 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Add APIs to decode P1/P2 Rest Octets

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32972 ) Change subject: rlcmac: Add APIs to decode P1/P2 Rest Octets ...................................................................... Patch Set 3: (1 comment) Patchset: PS3: I added a unit test with sample P1 Rest Octets from a pcap we generate in PCU_Tests. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I59c6723d969880a4481e3b86a172d59f0edeb1e4 Gerrit-Change-Number: 32972 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 May 2023 13:11:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Add APIs to decode P1/P2 Rest Octets

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32972 to look at the new patch set (#3). Change subject: rlcmac: Add APIs to decode P1/P2 Rest Octets ...................................................................... rlcmac: Add APIs to decode P1/P2 Rest Octets Change-Id: I59c6723d969880a4481e3b86a172d59f0edeb1e4 --- M include/osmocom/gprs/rlcmac/csn1_defs.h M src/rlcmac/csn1_ts_44_018.c M tests/rlcmac/csn1_ts_44_018_test.c M tests/rlcmac/csn1_ts_44_018_test.err M tests/rlcmac/csn1_ts_44_018_test.ok 5 files changed, 72 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/72/32972/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32972 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I59c6723d969880a4481e3b86a172d59f0edeb1e4 Gerrit-Change-Number: 32972 Gerrit-PatchSet: 3 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-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Submit GMMRR-PAGE.ind upon rx of Paging Request Type 1/2

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32985 ) Change subject: rlcmac: Submit GMMRR-PAGE.ind upon rx of Paging Request Type 1/2 ...................................................................... Patch Set 2: (3 comments) File src/rlcmac/rlcmac.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/32985/comment/506c7d79_90d94fa7 PS2, Line 338: struct gsm48_paging1 *pag > const? Ack https://gerrit.osmocom.org/c/libosmo-gprs/+/32985/comment/c8681a1e_8419df67 PS2, Line 352: if (GSM_MACBLOCK_LEN < sizeof(*pag)) > Not sure why would you want to check this at run-time. […] that's from previous code where GSM_MACBLOCK_LEN used to be msgb_l3len(msg), I'll drop it. https://gerrit.osmocom.org/c/libosmo-gprs/+/32985/comment/2961e814_7008e807 PS2, Line 363: if (GSM_MACBLOCK_LEN < sizeof(*pag) + 1) > Same here, `sizeof(*pag)` does not change at run-time, right? same. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I64db4277b5c54870a258d63c554f470011bcc989 Gerrit-Change-Number: 32985 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 May 2023 12:52:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Submit GMMRR-PAGE.ind upon rx of Paging Request Type 1/2

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32985 ) Change subject: rlcmac: Submit GMMRR-PAGE.ind upon rx of Paging Request Type 1/2 ...................................................................... Patch Set 2: (4 comments) File include/osmocom/gprs/rlcmac/rlcmac_private.h: https://gerrit.osmocom.org/c/libosmo-gprs/+/32985/comment/1d1c9e60_d0b1af4b PS2, Line 94: gprs_rlcmac_handle_ccch_pag_req_1 cosmetic: maybe `..._pag_req1` or `..._pag_req_type1`? File src/rlcmac/rlcmac.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/32985/comment/8fc2b204_fb3f55b7 PS2, Line 338: struct gsm48_paging1 *pag const? https://gerrit.osmocom.org/c/libosmo-gprs/+/32985/comment/13ad537b_d094ce39 PS2, Line 352: if (GSM_MACBLOCK_LEN < sizeof(*pag)) Not sure why would you want to check this at run-time. Looks like a candidate for `osmo_static_assert`? https://gerrit.osmocom.org/c/libosmo-gprs/+/32985/comment/4f43b092_2b79d922 PS2, Line 363: if (GSM_MACBLOCK_LEN < sizeof(*pag) + 1) Same here, `sizeof(*pag)` does not change at run-time, right? -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32985 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I64db4277b5c54870a258d63c554f470011bcc989 Gerrit-Change-Number: 32985 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 May 2023 12:27:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023