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

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

by fixeria

Attention is currently required from: laforge, dexter. fixeria 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: (1 comment) File library/RLCMAC_CSN1_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/adb307a5_ac8d… PS1, Line 969: utran_cell_list_index Actually, this field should also be part of the list. ``` type record of UtranCCNMesurementReportItem ReportingQuantityList; type record UtranCCNMesurementReportItem { uint7_t cell_list_index, uint6_t reporting_quantity } with { variant "" }; type record UtranCCNMesurementReport { uint3_t n_3g, ReportingQuantityList cells, } with { ... }; ``` -- 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: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 May 2023 15:09:12 +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 fixeria

Attention is currently required from: laforge, dexter. fixeria 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: Code-Review-1 (3 comments) File library/RLCMAC_CSN1_Types.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/84f9d546_65fc… PS1, Line 946: fdd_arfcn_presence This definition is not entirely correct. Below is my understanding of TS 44.060: * if this bit is `'0'B`, then neither `fdd_arfcn` nor the other FDD related fields are present, i.e. the next field in the bitstream would be `tdd_arfcn_presence`; * if this bit is `'1'B`, then both `fdd_arfcn` and `scrambling_code` and at least `bandwith_fdd_presence` are present in the bitstream. Taking this into account, your definition should look as follows: ``` type record UtranTargetCellFdd { uint14_t arfcn, BIT1 bandwith_presence, uint3_t bandwith optional, uint10_t scrambling_code } with { variant (bandwith) "PRESENCE(bandwith_presence = '1'B)" }; type record UtranTargetCellTdd { uint14_t arfcn, BIT1 bandwith_presence, uint3_t bandwith optional, uint7_t cell_parameter, BIT1 sync_case } with { variant (bandwith) "PRESENCE(bandwith_presence = '1'B)" }; type record UtranTargetCell { BIT1 fdd_presence, UtranTargetCellFdd fdd optional, BIT1 tdd_presence, UtranTargetCellTdd tdd optional, uint6_t reporting_quantity } with { variant (fdd) "PRESENCE(fdd_presence = '1'B)" variant (tdd) "PRESENCE(tdd_presence = '1'B)" }; ``` https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/14110677_9046… PS1, Line 972: "LENGTHTO(reporting_quantity)" Note that `n_3g := 0` means that `reporting_quantity` contains 1 element. This should actually be: `LENGTHTO(reporting_quantity) - 1`. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32995/comment/cf62cf51_e062… PS1, Line 1001: utran_ba_used missing `optional` -- 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: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 May 2023 14:59:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: docs: add SUPI/SUCI usage example

by laforge

Attention is currently required from: merlinchlosta, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32688 ) Change subject: docs: add SUPI/SUCI usage example ...................................................................... Patch Set 3: (1 comment) File docs/suci-tutorial.rst: https://gerrit.osmocom.org/c/pysim/+/32688/comment/211e6edf_1a4aaf91 PS3, Line 100: 0272DA71976234CE833A6907425867B82E074D44EF907DFB4B3E21C1C2256EBCD1 any specific reason you chose the compressed form, rather than the uncompressed form? According to RFC5480 Section 2.2: > Implementations of Elliptic Curve Cryptography according to this > document MUST support the uncompressed form and MAY support the > compressed form of the ECC public key. So I would have assumed using the uncompressed form maximizes compatibility/interoperability? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2908ea9df7e78c596554731085902e2ab7278328 Gerrit-Change-Number: 32688 Gerrit-PatchSet: 3 Gerrit-Owner: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: merlinchlosta <merlin.chlosta(a)rub.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 May 2023 14:56:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: modem: Forward Paging Request Type 1/2 to rlcmac layer

by pespin

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/32973 to look at the new patch set (#5). Change subject: layer23: modem: Forward Paging Request Type 1/2 to rlcmac layer ...................................................................... layer23: modem: Forward Paging Request Type 1/2 to rlcmac layer The RLCMAC layer in libosmo-gprs-rlcmac will decode the messages and if matching the MS, forward it to GMM, who will see if it requires initiating a packet access procedure. Change-Id: Iee4b5ee5e1e5874b550dd8536b095bf0b5eeb8f4 --- M src/host/layer23/src/modem/grr.c 1 file changed, 57 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/73/32973/5 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iee4b5ee5e1e5874b550dd8536b095bf0b5eeb8f4 Gerrit-Change-Number: 32973 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32982 ) 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/gmm/gmm_prim.c b/src/gmm/gmm_prim.c index 34c9fe9..b6d8dac 100644 --- a/src/gmm/gmm_prim.c +++ b/src/gmm/gmm_prim.c @@ -603,6 +603,27 @@ return rc; } +static int gprs_gmm_prim_handle_gmmrr_page_ind(struct osmo_gprs_gmm_prim *gmm_prim) +{ + struct osmo_gprs_llc_prim *llc_prim_tx; + int rc; + struct gprs_gmm_entity *gmme; + + if (!(gmme = gprs_gmm_find_gmme_by_tlli(gmm_prim->gmmrr.tlli))) { + LOGGMM(LOGL_NOTICE, "Rx %s: Unknown TLLI 0x%08x\n", + osmo_gprs_gmm_prim_name(gmm_prim), gmm_prim->gmmrr.tlli); + return -ENOENT; + } + + /* TS 24.007 C.13: restart READY timer, submit LLGM-TRIGGER.req */ + gprs_gmm_gmme_ready_timer_start(gmme); + + llc_prim_tx = osmo_gprs_llc_prim_alloc_llgmm_trigger_req(gmme->tlli, OSMO_GPRS_LLC_LLGM_TRIGGER_PAGE_RESP); + + rc = gprs_gmm_prim_call_llc_down_cb(llc_prim_tx); + return rc; +} + static int gprs_gmm_prim_handle_gmmrr_llc_transmitted_ind(struct osmo_gprs_gmm_prim *gmm_prim) { struct gprs_gmm_entity *gmme = gprs_gmm_find_gmme_by_tlli(gmm_prim->gmmrr.tlli); @@ -620,8 +641,7 @@ int rc = 0; switch (OSMO_PRIM_HDR(&gmm_prim->oph)) { case OSMO_PRIM(OSMO_GPRS_GMM_GMMRR_PAGE, PRIM_OP_INDICATION): - rc = gprs_gmm_prim_handle_unsupported(gmm_prim); - rc = 1; + rc = gprs_gmm_prim_handle_gmmrr_page_ind(gmm_prim); break; case OSMO_PRIM(OSMO_GPRS_GMM_GMMRR_LLC_TRANSMITTED, PRIM_OP_INDICATION): rc = gprs_gmm_prim_handle_gmmrr_llc_transmitted_ind(gmm_prim); diff --git a/tests/gmm/gmm_prim_test.c b/tests/gmm/gmm_prim_test.c index 7eefc73..89f621c 100644 --- a/tests/gmm/gmm_prim_test.c +++ b/tests/gmm/gmm_prim_test.c @@ -458,6 +458,14 @@ /* ... */ + /* Test PS paging request arriving from CCCH (RR): */ + gmm_prim = osmo_gprs_gmm_prim_alloc_gmmrr_page_ind(tlli); + OSMO_ASSERT(gmm_prim); + rc = osmo_gprs_gmm_prim_lower_up(gmm_prim); + OSMO_ASSERT(rc == 0); + + /* ... */ + /* DETACH */ gmm_prim = osmo_gprs_gmm_prim_alloc_gmmreg_detach_req(); OSMO_ASSERT(gmm_prim); diff --git a/tests/gmm/gmm_prim_test.err b/tests/gmm/gmm_prim_test.err index 6720d69..dea0ca7 100644 --- a/tests/gmm/gmm_prim_test.err +++ b/tests/gmm/gmm_prim_test.err @@ -37,6 +37,8 @@ DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ec999002:TLLI-ec999002) READY timer started (expires in 10 seconds) DLGLOBAL INFO GMM_MS{RAUInitidated}: Received Event RAU_ACCEPTED DLGLOBAL INFO GMM_MS{RAUInitidated}: state_chg to Registered +DLGLOBAL INFO Rx from lower layers: GMRR-PAGE.indication +DLGLOBAL INFO GMME(IMSI-1234567890:PTMSI-ec999002:TLLI-ec999002) READY timer started (expires in 10 seconds) DLGLOBAL INFO Rx from upper layers: GMMREG-DETACH.request DLGLOBAL INFO GMM_MS{Registered}: Received Event DETACH_REQUESTED DLGLOBAL INFO GMM_MS{Registered}: state_chg to DeregisteredInitiated diff --git a/tests/gmm/gmm_prim_test.ok b/tests/gmm/gmm_prim_test.ok index 870d58f..6cf672a 100644 --- a/tests/gmm/gmm_prim_test.ok +++ b/tests/gmm/gmm_prim_test.ok @@ -19,6 +19,7 @@ test_gmm_prim_down_cb(): Rx GMRR-ASSIGN.request old_tlli=0xea711b41 new_tlli=0xec999002 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xec999002 SAPI=GMM l3=[08 0a ] test_gmm_prim_llc_down_cb(): Rx LLGMM-RESUME.request TLLI=0xec999002 +test_gmm_prim_llc_down_cb(): Rx LLGMM-TRIGGER.request TLLI=0xec999002 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xec999002 SAPI=GMM l3=[08 05 20 0a 00 05 f4 ec 99 90 02 ] test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request old_TLLI=0xec999002 new_TLLI=0xffffffff test_gmm_prim_up_cb(): Rx GMMREG-DETACH.confirm detach_type='GPRS detach' -- 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-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Provide rlcmac with IMSI & PTMSI information

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32984 ) Change subject: gmm: Provide rlcmac with IMSI & PTMSI information ...................................................................... gmm: Provide rlcmac with IMSI & PTMSI information This information will be needed once the GRR layer starts listening for paging requests, which identify MS by either PTMSI or IMSI. Change-Id: I3a0c4a57c3d624c3ebb40ae2cc0c96626ccc2c99 --- M include/osmocom/gprs/gmm/gmm_prim.h M include/osmocom/gprs/rlcmac/gre.h M include/osmocom/gprs/rlcmac/rlcmac_prim.h M src/gmm/gmm.c M src/rlcmac/gre.c M src/rlcmac/rlcmac_prim.c M tests/rlcmac/rlcmac_prim_test.c 7 files changed, 38 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/gmm/gmm_prim.h b/include/osmocom/gprs/gmm/gmm_prim.h index 4b8657f..b774ef8 100644 --- a/include/osmocom/gprs/gmm/gmm_prim.h +++ b/include/osmocom/gprs/gmm/gmm_prim.h @@ -185,6 +185,8 @@ /* OSMO_GPRS_GMM_GMMRR_ASSIGN | Req */ struct { uint32_t new_tlli; + uint32_t ptmsi; + char imsi[OSMO_IMSI_BUF_SIZE]; } assign_req; /* OSMO_GPRS_GMM_GMMRR_PAGE | Ind */ struct { diff --git a/include/osmocom/gprs/rlcmac/gre.h b/include/osmocom/gprs/rlcmac/gre.h index 358d0aa..3afeadc 100644 --- a/include/osmocom/gprs/rlcmac/gre.h +++ b/include/osmocom/gprs/rlcmac/gre.h @@ -12,6 +12,10 @@ struct llist_head entry; /* item in (struct gprs_rlcmac_ctx)->gre_list */ uint32_t tlli; + /* Used to match paging requests coming from CS domain: */ + uint32_t ptmsi; + char imsi[OSMO_IMSI_BUF_SIZE]; + struct gprs_rlcmac_llc_queue *llc_queue; /* Manage TBF Starting Time delay during TBF assignment: */ diff --git a/include/osmocom/gprs/rlcmac/rlcmac_prim.h b/include/osmocom/gprs/rlcmac/rlcmac_prim.h index c44de22..fa1ee52 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_prim.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_prim.h @@ -91,6 +91,8 @@ /* OSMO_GPRS_RLCMAC_GMMRR_ASSIGN | Req */ struct { uint32_t new_tlli; + uint32_t ptmsi; + char imsi[OSMO_IMSI_BUF_SIZE]; } assign_req; /* OSMO_GPRS_RLCMAC_GMMRR_PAGE | Ind */ struct { diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index f59147b..141ef79 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -459,6 +459,8 @@ int rc; gmm_prim_tx = gprs_gmm_prim_alloc_gmmrr_assign_req(gmme->old_tlli, gmme->tlli); + gmm_prim_tx->gmmrr.assign_req.ptmsi = gmme->ptmsi; + OSMO_STRLCPY_ARRAY(gmm_prim_tx->gmmrr.assign_req.imsi, gmme->imsi); rc = gprs_gmm_prim_call_down_cb(gmm_prim_tx); return rc; diff --git a/src/rlcmac/gre.c b/src/rlcmac/gre.c index fe18a43..e728695 100644 --- a/src/rlcmac/gre.c +++ b/src/rlcmac/gre.c @@ -56,6 +56,7 @@ goto err_free_gre; gre->tlli = tlli; + gre->ptmsi = GSM_RESERVED_TMSI; llist_add_tail(&gre->entry, &g_rlcmac_ctx->gre_list); return gre; diff --git a/src/rlcmac/rlcmac_prim.c b/src/rlcmac/rlcmac_prim.c index 7337647..6e2285b 100644 --- a/src/rlcmac/rlcmac_prim.c +++ b/src/rlcmac/rlcmac_prim.c @@ -426,6 +426,8 @@ goto free_ret; } gprs_rlcmac_entity_free(gre); + gre = NULL; + goto free_ret; } else { /* Case "update", both old_tlli and new_tlli are valid */ gre = gprs_rlcmac_find_entity_by_tlli(old_tlli); @@ -438,6 +440,11 @@ gre->tlli = new_tlli; } + /* cache/update knowledge about this GMME's PTMSI and IMSI. It will be + * needed later on to match paging requests: */ + gre->ptmsi = rlcmac_prim->gmmrr.assign_req.ptmsi; + OSMO_STRLCPY_ARRAY(gre->imsi, rlcmac_prim->gmmrr.assign_req.imsi); + free_ret: msgb_free(rlcmac_prim->oph.msg); return rc; diff --git a/tests/rlcmac/rlcmac_prim_test.c b/tests/rlcmac/rlcmac_prim_test.c index 5633da2..6213a04 100644 --- a/tests/rlcmac/rlcmac_prim_test.c +++ b/tests/rlcmac/rlcmac_prim_test.c @@ -904,6 +904,8 @@ printf("=== %s start ===\n", __func__); prepare_test(); + uint32_t ptmsi = 0x00001234; + char *imsi = "1234567890"; uint32_t tlli = 0x0000001; uint8_t ts_nr = 7; uint8_t usf = 0; @@ -913,6 +915,8 @@ /* Notify RLCMAC about our TLLI */ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_gmmrr_assign_req(GPRS_RLCMAC_TLLI_UNASSIGNED, tlli); + rlcmac_prim->gmmrr.assign_req.ptmsi = ptmsi; + OSMO_STRLCPY_ARRAY(rlcmac_prim->gmmrr.assign_req.imsi, imsi); rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); OSMO_ASSERT(sizeof(ccch_imm_ass_pkt_dl_tbf) == GSM_MACBLOCK_LEN); @@ -951,6 +955,8 @@ printf("=== %s start ===\n", __func__); prepare_test(); RlcMacDownlink_t dl_block; + uint32_t ptmsi = 0x00001234; + char *imsi = "1234567890"; uint32_t tlli = 0x0000001; uint8_t ts_nr = 7; uint8_t usf = 0; @@ -963,6 +969,8 @@ /* Notify RLCMAC about our TLLI */ rlcmac_prim = osmo_gprs_rlcmac_prim_alloc_gmmrr_assign_req(GPRS_RLCMAC_TLLI_UNASSIGNED, tlli); + rlcmac_prim->gmmrr.assign_req.ptmsi = ptmsi; + OSMO_STRLCPY_ARRAY(rlcmac_prim->gmmrr.assign_req.imsi, imsi); rc = osmo_gprs_rlcmac_prim_upper_down(rlcmac_prim); OSMO_ASSERT(sizeof(ccch_imm_ass_pkt_dl_tbf) == GSM_MACBLOCK_LEN); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3a0c4a57c3d624c3ebb40ae2cc0c96626ccc2c99 Gerrit-Change-Number: 32984 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32972 ) 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/rlcmac/csn1_defs.h b/include/osmocom/gprs/rlcmac/csn1_defs.h index 5e4b599..f4c7870 100644 --- a/include/osmocom/gprs/rlcmac/csn1_defs.h +++ b/include/osmocom/gprs/rlcmac/csn1_defs.h @@ -5365,3 +5365,7 @@ const uint8_t *data, size_t data_len); int osmo_gprs_rlcmac_decode_imm_ass_ro(IA_RestOctets_t *storage, const uint8_t *data, size_t data_len); +int osmo_gprs_rlcmac_decode_p1ro(P1_Rest_Octets_t *storage, + const uint8_t *data, size_t data_len); +int osmo_gprs_rlcmac_decode_p2ro(P2_Rest_Octets_t *storage, + const uint8_t *data, size_t data_len); diff --git a/src/rlcmac/csn1_ts_44_018.c b/src/rlcmac/csn1_ts_44_018.c index cc62c62..40275f4 100644 --- a/src/rlcmac/csn1_ts_44_018.c +++ b/src/rlcmac/csn1_ts_44_018.c @@ -35,40 +35,31 @@ /*<P1 Rest Octets>*/ /*<P2 Rest Octets>*/ -#if 0 static const CSN_DESCR_BEGIN(MobileAllocationIE_t) M_UINT (MobileAllocationIE_t, Length, 8), M_VAR_ARRAY (MobileAllocationIE_t, MA, Length, 0), CSN_DESCR_END (MobileAllocationIE_t) -#endif -#if 0 static const CSN_DESCR_BEGIN(SingleRFChannel_t) M_UINT (SingleRFChannel_t, spare, 2), M_UINT (SingleRFChannel_t, ARFCN, 10), CSN_DESCR_END (SingleRFChannel_t) -#endif -#if 0 static const CSN_DESCR_BEGIN(RFHoppingChannel_t) M_UINT (RFHoppingChannel_t, MAIO, 6), M_UINT (RFHoppingChannel_t, HSN, 6), CSN_DESCR_END (RFHoppingChannel_t) -#endif -#if 0 static const CSN_DESCR_BEGIN(MobileAllocation_or_Frequency_Short_List_t) M_UNION (MobileAllocation_or_Frequency_Short_List_t, 2), M_BITMAP (MobileAllocation_or_Frequency_Short_List_t, u.Frequency_Short_List, 64), M_TYPE (MobileAllocation_or_Frequency_Short_List_t, u.MA, MobileAllocationIE_t), CSN_DESCR_END (MobileAllocation_or_Frequency_Short_List_t) -#endif -#if 0 static const CSN_DESCR_BEGIN(Channel_Description_t) M_UINT (Channel_Description_t, Channel_type_and_TDMA_offset, 5), @@ -79,9 +70,7 @@ M_TYPE (Channel_Description_t, u.SingleRFChannel, SingleRFChannel_t), M_TYPE (Channel_Description_t, u.RFHoppingChannel, RFHoppingChannel_t), CSN_DESCR_END(Channel_Description_t) -#endif -#if 0 static const CSN_DESCR_BEGIN(Group_Channel_Description_t) M_TYPE (Group_Channel_Description_t, Channel_Description, Channel_Description_t), @@ -89,9 +78,7 @@ M_NEXT_EXIST (Group_Channel_Description_t, Exist_Hopping, 1), M_TYPE (Group_Channel_Description_t, MA_or_Frequency_Short_List, MobileAllocation_or_Frequency_Short_List_t), CSN_DESCR_END (Group_Channel_Description_t) -#endif -#if 0 static const CSN_DESCR_BEGIN(Group_Call_Reference_t) M_UINT (Group_Call_Reference_t, value, 27), @@ -100,9 +87,7 @@ M_UINT (Group_Call_Reference_t, call_priority, 3), M_UINT (Group_Call_Reference_t, Ciphering_information, 4), CSN_DESCR_END (Group_Call_Reference_t) -#endif -#if 0 static const CSN_DESCR_BEGIN(Group_Call_information_t) M_TYPE (Group_Call_information_t, Group_Call_Reference, Group_Call_Reference_t), @@ -110,9 +95,7 @@ M_NEXT_EXIST (Group_Call_information_t, Exist_Group_Channel_Description, 1), M_TYPE (Group_Call_information_t, Group_Channel_Description, Group_Channel_Description_t), CSN_DESCR_END (Group_Call_information_t) -#endif -#if 0 static const CSN_DESCR_BEGIN (P1_Rest_Octets_t) M_NEXT_EXIST_LH(P1_Rest_Octets_t, Exist_NLN_PCH_and_NLN_status, 2), @@ -131,9 +114,7 @@ M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_1, 1), M_UINT_LH (P1_Rest_Octets_t, Packet_Page_Indication_2, 1), CSN_DESCR_END (P1_Rest_Octets_t) -#endif -#if 0 static const CSN_DESCR_BEGIN (P2_Rest_Octets_t) M_NEXT_EXIST_LH(P2_Rest_Octets_t, Exist_CN3, 1), @@ -154,7 +135,6 @@ M_UINT_LH (P2_Rest_Octets_t, Packet_Page_Indication_3, 1), CSN_DESCR_END (P2_Rest_Octets_t) -#endif static const CSN_DESCR_BEGIN(DynamicAllocation_t) @@ -672,3 +652,21 @@ "IA Rest Octets", data, data_len); } + +int osmo_gprs_rlcmac_decode_p1ro(P1_Rest_Octets_t *storage, + const uint8_t *data, size_t data_len) +{ + return _osmo_gprs_rlcmac_decode(storage, + CSNDESCR(P1_Rest_Octets_t), + "P1 Rest Octets", + data, data_len); +} + +int osmo_gprs_rlcmac_decode_p2ro(P2_Rest_Octets_t *storage, + const uint8_t *data, size_t data_len) +{ + return _osmo_gprs_rlcmac_decode(storage, + CSNDESCR(P2_Rest_Octets_t), + "P2 Rest Octets", + data, data_len); +} diff --git a/tests/rlcmac/csn1_ts_44_018_test.c b/tests/rlcmac/csn1_ts_44_018_test.c index bef4e8b..e62df0a 100644 --- a/tests/rlcmac/csn1_ts_44_018_test.c +++ b/tests/rlcmac/csn1_ts_44_018_test.c @@ -86,6 +86,40 @@ printf("\n"); } +static void test_p1ro(void) +{ + printf("*** %s ***\n", __func__); + + static const char * const testData[] = { + /* P1 Rest Octets + * L... .... = NLN(PCH): Not Present + * .L.. .... = Priority 1: Not Present + * ..L. .... = Priority 2: Not Present + * ...L .... = Group Call Information: Not Present + * .... H... = Packet Page Indication 1: For GPRS + * .... .H.. = Packet Page Indication 2: For GPRS + * Padding Bits: default padding + */ + "272b2b2b2b2b2b2b2b2b", + }; + + for (unsigned int i = 0; i < ARRAY_SIZE(testData); i++) { + uint8_t buf[17]; + P1_Rest_Octets_t p1ro = { 0 }; + int rc; + + printf("testData[%d] = %s\n", i, testData[i]); + + rc = osmo_hexparse(testData[i], &buf[0], sizeof(buf)); + OSMO_ASSERT(rc >= 0); + + rc = osmo_gprs_rlcmac_decode_p1ro(&p1ro, &buf[0], rc); + printf("osmo_gprs_rlcmac_decode_p1ro() returns %d\n", rc); + } + + printf("\n"); +} + static const struct log_info_cat test_log_categories[] = { }; static const struct log_info test_log_info = { .cat = test_log_categories, @@ -107,6 +141,7 @@ test_si13ro(); test_imm_ass_ro(); + test_p1ro(); talloc_free(tall_ctx); } diff --git a/tests/rlcmac/csn1_ts_44_018_test.err b/tests/rlcmac/csn1_ts_44_018_test.err index 61d77c8..0f3d92b 100644 --- a/tests/rlcmac/csn1_ts_44_018_test.err +++ b/tests/rlcmac/csn1_ts_44_018_test.err @@ -8,3 +8,5 @@ DLCSN1 INFO osmo_csn1_stream_decode (IA Rest Octets): u.hh = 3 | : u.hh | u.UplinkDownlinkAssignment = 0 | : u.UplinkDownlinkAssignment | ul_dl.Packet_Downlink_ImmAssignment = 1 | : ul_dl.Packet_Downlink_ImmAssignment | TLLI = 0xd6e1ae5a | Exist_TFI_to_TA_VALID = 1 | TFI_ASSIGNMENT = 3 | RLC_MODE = 0 | Exist_ALPHA = 0 | GAMMA = 15 | POLLING = 0 | TA_VALID = 0 | Exist_TIMING_ADVANCE_INDEX = 0 | Exist_TBF_STARTING_TIME = 0 | Exist_P0_PR_MODE = 1 | P0 = 0 | BTS_PWR_CTRL_MODE = 0 | PR_MODE = 1 | Exist_AdditionsR99 = 0 | : End ul_dl.Packet_Downlink_ImmAssignment | : End u.UplinkDownlinkAssignment | Exist_AdditionsR10 = 0 | Exist_AdditionsR13 = 0 | : End u.hh | Padding = 0|86|86|-22| DLCSN1 INFO osmo_csn1_stream_decode (IA Rest Octets): u.lh = 1 | : u.lh | lh0x = 0 | : lh0x | u.EGPRS_PktUlAss = 0 | : u.EGPRS_PktUlAss | ExtendedRA = 12 | AccessTechnologyType = Exist | AccessTechnologyType = 0 | AccessTechnologyType = Exist | AccessTechnologyType = 3 | AccessTechnologyType = 0 | Access.OnePhaseAccess = 1 | : Access.OnePhaseAccess | TFI_ASSIGNMENT = 7 | POLLING = 0 | Allocation.DynamicAllocation = 0 | : Allocation.DynamicAllocation | USF = 3 | USF_GRANULARITY = 0 | Exist_P0_PR_MODE = 0 | : End Allocation.DynamicAllocation | EGPRS_CHANNEL_CODING_COMMAND = 2 | TLLI_BLOCK_CHANNEL_CODING = 1 | Exist_BEP_PERIOD2 = 1 | BEP_PERIOD2 = 5 | RESEGMENT = 1 | EGPRS_WindowSize = 4 | Exist_ALPHA = 0 | GAMMA = 13 | Exist_TIMING_ADVANCE_INDEX = 1 | TIMING_ADVANCE_INDEX = 0 | Exist_TBF_STARTING_TIME = 0 | : End Access.OnePhaseAccess | : End u.EGPRS_PktUlAss | : End lh0x | : AdditionsR13 | Exist_AdditionsR13 = 0 | : End AdditionsR13 | : End u.lh | Padding = 0|172|172|-22| DLCSN1 INFO osmo_csn1_stream_decode (IA Rest Octets): u.lh = 1 | : u.lh | lh0x = 0 | : lh0x | u.EGPRS_PktUlAss = 0 | : u.EGPRS_PktUlAss | ExtendedRA = 8 | AccessTechnologyType = Exist | AccessTechnologyType = 0 | AccessTechnologyType = Exist | AccessTechnologyType = 3 | AccessTechnologyType = 0 | Access.TwoPhaseAccess = 0 | : Access.TwoPhaseAccess | Exist_ALPHA = 0 | GAMMA = 13 | : TBF_STARTING_TIME | N32 = 20 | N51 = 45 | N26 = 0 | : End TBF_STARTING_TIME | NR_OF_RADIO_BLOCKS_ALLOCATED = 1 | Exist_P0_BTS_PWR_CTRL_PR_MODE = 0 | : End Access.TwoPhaseAccess | : End u.EGPRS_PktUlAss | : End lh0x | : AdditionsR13 | Exist_AdditionsR13 = 0 | : End AdditionsR13 | : End u.lh | Padding = 0|86|86|86|86|-22| +DLCSN1 INFO osmo_csn1_stream_decode (P1 Rest Octets): Exist_NLN_PCH_and_NLN_status = 0 | Exist_Priority1 = 0 | Exist_Priority2 = 0 | Exist_Group_Call_information = 0 | Packet_Page_Indication_1 = 1 | Packet_Page_Indication_2 = 1 | +DLGLOBAL NOTICE P1 Rest Octets: 74 remaining bits unhandled by decoder diff --git a/tests/rlcmac/csn1_ts_44_018_test.ok b/tests/rlcmac/csn1_ts_44_018_test.ok index 6847f07..d720061 100644 --- a/tests/rlcmac/csn1_ts_44_018_test.ok +++ b/tests/rlcmac/csn1_ts_44_018_test.ok @@ -22,3 +22,7 @@ testData[4] = 444261b4b40b2b2b2b2b2b osmo_gprs_rlcmac_decode_imm_ass_ro() returns 0 +*** test_p1ro *** +testData[0] = 272b2b2b2b2b2b2b2b2b +osmo_gprs_rlcmac_decode_p1ro() returns 0 + -- 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-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

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

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32983 ) 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(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index d675954..c03f396 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -88,6 +88,16 @@ return get_value_string(osmo_gprs_llc_bssgp_prim_type_names, val); } +/* TS 04.64 Section 7.2.1.3 LLGMM-TRIGGER */ +/* 3GPP TS 24.008 2.1.2 "Cell Notification" is considered a different trigger + * type than Cell Update since lower layers behave different (tx LLC NULL vs UI + * frame). Furthermore, the one knowing about requirement to use one or the other + * is the upper layer (GMM), as well as the one responsible of READY timer. */ +enum osmo_gprs_llc_llgmm_trigger_type { + OSMO_GPRS_LLC_LLGM_TRIGGER_CELL_UPDATE, + OSMO_GPRS_LLC_LLGM_TRIGGER_CELL_NOTIFICATION, + OSMO_GPRS_LLC_LLGM_TRIGGER_PAGE_RESP, +}; /* Parameters for OSMO_GPRS_LLC_LLGMM_* prims */ struct osmo_gprs_llc_llgmm_prim { @@ -104,7 +114,7 @@ } assign_req; /* OSMO_GPRS_LLC_LLGMM_TRIGGER | Req */ struct { - uint8_t cause; + uint8_t cause; /* enum osmo_gprs_llc_llgmm_trigger_type */ } trigger_req; /* OSMO_GPRS_LLC_LLGMM_SUSPEND | Req */ struct { diff --git a/include/osmocom/gprs/llc/llc_private.h b/include/osmocom/gprs/llc/llc_private.h index ed68c7b..78e6e9f 100644 --- a/include/osmocom/gprs/llc/llc_private.h +++ b/include/osmocom/gprs/llc/llc_private.h @@ -323,6 +323,7 @@ int gprs_llc_lle_tx_xid_req(struct gprs_llc_lle *lle, uint8_t *l3par, unsigned int l3par_len); int gprs_llc_lle_tx_xid_resp(struct gprs_llc_lle *lle, uint8_t *l3par, unsigned int l3par_len); int gprs_llc_lle_tx_ui(struct gprs_llc_lle *lle, uint8_t *l3_pdu, size_t l3_pdu_len, bool encryptable); +int gprs_llc_lle_tx_null(const struct gprs_llc_lle *lle); /* llc_prim.c: */ struct osmo_gprs_llc_prim *gprs_llc_prim_alloc(enum osmo_gprs_llc_prim_sap sap, unsigned int type, diff --git a/src/llc/llc.c b/src/llc/llc.c index 4be7a9a..93a11ec 100644 --- a/src/llc/llc.c +++ b/src/llc/llc.c @@ -292,6 +292,46 @@ return 0; } +/* 6.4.1.7 NULL command */ +int gprs_llc_lle_tx_null(const struct gprs_llc_lle *lle) +{ + int rc; + struct msgb *msg; + struct gprs_llc_pdu_decoded pdu_dec = { + .sapi = lle->sapi, + .fmt = OSMO_GPRS_LLC_FMT_U, + .func = OSMO_GPRS_LLC_FUNC_NULL, + .flags = 0 /* P=0 */, + }; + struct osmo_gprs_llc_prim *llc_prim; + + /* LLC payload is put directly below: */ + if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_SGSN) + llc_prim = gprs_llc_prim_alloc_bssgp_dl_unitdata_req(lle->llme->tlli, NULL, 4096 - sizeof(llc_prim)); + else + llc_prim = gprs_llc_prim_alloc_grr_unitdata_req(lle->llme->tlli, NULL, 4096 - sizeof(llc_prim)); + msg = llc_prim->oph.msg; + msg->l3h = msg->tail; + + rc = gprs_llc_pdu_encode(msg, &pdu_dec); + if (rc < 0) { + LOGLLC(LOGL_NOTICE, "Failed to encode U DM\n"); + msgb_free(msg); + return rc; + } + if (g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS) { + llc_prim->bssgp.ll_pdu = msgb_l3(msg); + llc_prim->bssgp.ll_pdu_len = msgb_l3len(msg); + } else { + llc_prim->grr.ll_pdu = msgb_l3(msg); + llc_prim->grr.ll_pdu_len = msgb_l3len(msg); + } + + /* Send BSSGP-DL-UNITDATA.req (SGSN) / GRR-UNITDATA.req (MS) */ + gprs_llc_prim_call_down_cb(llc_prim); + return 0; +} + /* Transmit a UI frame over the given SAPI: 'encryptable' indicates whether particular message can be encrypted according to 3GPP TS 24.008 § 4.7.1.2 diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c index bf161e3..d85a30e 100644 --- a/src/llc/llc_llgmm.c +++ b/src/llc/llc_llgmm.c @@ -274,6 +274,46 @@ return rc; } +/* 7.2.1.3 LLGMM-TRIGGER.req (SGSN):*/ +static int llc_prim_handle_llgmm_trigger_req(struct osmo_gprs_llc_prim *llc_prim) +{ + struct gprs_llc_lle *lle; + int rc; + struct gprs_llc_llme *llme = gprs_llc_find_llme_by_tlli(llc_prim->llgmm.tlli); + + if (!llme) { + LOGLLC(LOGL_NOTICE, "Rx %s: Unknown TLLI 0x%08x\n", + osmo_gprs_llc_prim_name(llc_prim), llc_prim->llgmm.tlli); + rc = -ENOKEY; + goto ret_free; + } + LOGLLME(llme, LOGL_INFO, "%s\n", osmo_gprs_llc_prim_name(llc_prim)); + + lle = gprs_llc_llme_get_lle(llme, OSMO_GPRS_LLC_SAPI_GMM); + + /* "If there is a frame waiting to be transmitted in the MS, then this + * frame shall be transmitted on the corresponding SAPI or optionally a + * UI frame with no information field shall be transmitted on any SAPI. + * Otherwise if Cause indicates Cell Update and if Cell Notification is + * indicated by the SGSN (see 3GPP TS 24.008 [8a]), then a NULL frame + * with P=0 shall be transmitted on any SAPI." + */ + switch (llc_prim->llgmm.trigger_req.cause) { + case OSMO_GPRS_LLC_LLGM_TRIGGER_CELL_NOTIFICATION: + rc = gprs_llc_lle_tx_null(lle); + break; + case OSMO_GPRS_LLC_LLGM_TRIGGER_CELL_UPDATE: + case OSMO_GPRS_LLC_LLGM_TRIGGER_PAGE_RESP: + default: + rc = gprs_llc_lle_tx_ui(lle, NULL, 0, false); + break; + } + +ret_free: + msgb_free(llc_prim->oph.msg); + return rc; +} + /* 7.2.1.4 LLGMM-SUSPEND.req (MS/SGSN):*/ static int llc_prim_handle_llgmm_suspend_req(struct osmo_gprs_llc_prim *llc_prim) { @@ -332,7 +372,7 @@ break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_TRIGGER, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS); - rc = gprs_llc_prim_handle_unsupported(llc_prim); + rc = llc_prim_handle_llgmm_trigger_req(llc_prim); break; case OSMO_PRIM(OSMO_GPRS_LLC_LLGMM_SUSPEND, PRIM_OP_REQUEST): OSMO_ASSERT(g_llc_ctx->location == OSMO_GPRS_LLC_LOCATION_MS || diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c index b3ff512..bcba783 100644 --- a/tests/llc/llc_prim_test.c +++ b/tests/llc/llc_prim_test.c @@ -172,13 +172,31 @@ rc = osmo_gprs_llc_prim_upper_down(llc_prim); OSMO_ASSERT(rc == 0); - /* Rx LLC-GMM-Attach-Req at MS from SGSN (should be a response message + /* Rx LLC-GMM-Attach-Accept at MS from SGSN (should be a response message * but we don't care about upper layers here): */ llc_prim = osmo_gprs_llc_prim_alloc_grr_unitdata_ind(tlli, pdu_llc_gmm_att_req, sizeof(pdu_llc_gmm_att_req)); OSMO_ASSERT(llc_prim); rc = osmo_gprs_llc_prim_lower_up(llc_prim); OSMO_ASSERT(rc == 0); + /* Test GMM asking LLC to transmit a response for a Paging Request: */ + llc_prim = osmo_gprs_llc_prim_alloc_llgmm_trigger_req(tlli, OSMO_GPRS_LLC_LLGM_TRIGGER_PAGE_RESP); + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + OSMO_ASSERT(rc == 0); + + /* Test GMM asking LLC to transmit for Cell Update: */ + llc_prim = osmo_gprs_llc_prim_alloc_llgmm_trigger_req(tlli, OSMO_GPRS_LLC_LLGM_TRIGGER_CELL_UPDATE); + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + OSMO_ASSERT(rc == 0); + + /* Test GMM asking LLC to transmit for Cell Notification: */ + llc_prim = osmo_gprs_llc_prim_alloc_llgmm_trigger_req(tlli, OSMO_GPRS_LLC_LLGM_TRIGGER_CELL_NOTIFICATION); + OSMO_ASSERT(llc_prim); + rc = osmo_gprs_llc_prim_upper_down(llc_prim); + OSMO_ASSERT(rc == 0); + printf("==== %s() [end] ====\n", __func__); } diff --git a/tests/llc/llc_prim_test.err b/tests/llc/llc_prim_test.err index 444f3da..7cc72f5 100644 --- a/tests/llc/llc_prim_test.err +++ b/tests/llc/llc_prim_test.err @@ -3,6 +3,12 @@ DLGLOBAL INFO Rx from lower layers: GRR-UNITDATA.indication DLGLOBAL DEBUG Rx GRR-UNITDATA.indication: SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=0 FCS=f218e2 DLGLOBAL DEBUG LLE(ffffffff/f43cec71,GMM){UNASSIGNED} Rx SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=0 FCS=f218e2 +DLGLOBAL INFO Rx from upper layers: LLGMM-TRIGGER.request +DLGLOBAL INFO LLME(ffffffff/f43cec71){UNASSIGNED} LLGMM-TRIGGER.request +DLGLOBAL INFO Rx from upper layers: LLGMM-TRIGGER.request +DLGLOBAL INFO LLME(ffffffff/f43cec71){UNASSIGNED} LLGMM-TRIGGER.request +DLGLOBAL INFO Rx from upper layers: LLGMM-TRIGGER.request +DLGLOBAL INFO LLME(ffffffff/f43cec71){UNASSIGNED} LLGMM-TRIGGER.request DLGLOBAL INFO Rx from lower layers: BSSGP-UL-UNITDATA.indication DLGLOBAL DEBUG Rx BSSGP-UL-UNITDATA.indication: SAPI=1 (GMM), UI func=UI C/R=0 PM=0 E=0 IP=0 N(U)=0 FCS=f218e2 DLGLOBAL NOTICE LLME(ffffffff/e1c5d364){UNASSIGNED} LLC RX: unknown TLLI 0xe1c5d364, creating LLME on the fly diff --git a/tests/llc/llc_prim_test.ok b/tests/llc/llc_prim_test.ok index 4534568..ee381e6 100644 --- a/tests/llc/llc_prim_test.ok +++ b/tests/llc/llc_prim_test.ok @@ -1,6 +1,9 @@ ==== test_llc_prim_ms() [start] ==== test_llc_prim_down_cb(): Rx GRR-UNITDATA.request l3=[01 c0 01 08 01 02 e5 e0 01 0a 00 05 f4 f4 3c ec 71 32 f4 07 00 05 00 17 19 33 43 2b 37 15 9e f9 88 79 cb a2 8c 66 21 e7 26 88 b1 98 87 9c 00 17 05 22 96 cc ] test_llc_prim_up_cb(): Rx LL-UNITDATA.indication TLLI=0xf43cec71 SAPI=GMM l3=[08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 11 e5 10 00 ] +test_llc_prim_down_cb(): Rx GRR-UNITDATA.request l3=[01 c0 05 4a 85 74 ] +test_llc_prim_down_cb(): Rx GRR-UNITDATA.request l3=[01 c0 09 ce 0d f7 ] +test_llc_prim_down_cb(): Rx GRR-UNITDATA.request l3=[01 e0 1c a2 b3 ] ==== test_llc_prim_ms() [end] ==== ==== test_llc_prim_sgsn() [start] ==== test_llc_prim_up_cb(): Rx LL-UNITDATA.indication TLLI=0xe1c5d364 SAPI=GMM l3=[08 01 01 d5 71 00 00 08 29 26 24 00 00 00 00 71 62 f2 24 6c 84 44 04 11 e5 10 00 ] -- 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-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Provide rlcmac with IMSI & PTMSI information

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32984 ) Change subject: gmm: Provide rlcmac with IMSI & PTMSI information ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32984 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I3a0c4a57c3d624c3ebb40ae2cc0c96626ccc2c99 Gerrit-Change-Number: 32984 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 May 2023 14:47:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023