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

[S] Change in osmocom-bb[master]: layer23: modem: llc: Forward LL-Assign.req to SNDCP
by pespin 20 Jul '23

20 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33843 ) Change subject: layer23: modem: llc: Forward LL-Assign.req to SNDCP ...................................................................... layer23: modem: llc: Forward LL-Assign.req to SNDCP Depends: libosmo-gprs.git Change-Id I924dcf3ac9cbb15e26a5e9376f89ca098ab49e0b Change-Id: I0b0f025a0cd356c997fc4620f2d6be4792fc1d29 --- M src/host/layer23/src/modem/llc.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/43/33843/1 diff --git a/src/host/layer23/src/modem/llc.c b/src/host/layer23/src/modem/llc.c index 57e89f8..142f3cf 100644 --- a/src/host/layer23/src/modem/llc.c +++ b/src/host/layer23/src/modem/llc.c @@ -74,6 +74,7 @@ case OSMO_GPRS_LLC_LL_DATA: case OSMO_GPRS_LLC_LL_UNITDATA: case OSMO_GPRS_LLC_LL_STATUS: + case OSMO_GPRS_LLC_LL_ASSIGN: /* Forward it to upper layers, pass owneserip over to SNDCP: */ osmo_gprs_sndcp_prim_lower_up(llc_prim); rc = 1; /* Tell LLC that we take ownership of the prim. */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33843 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0b0f025a0cd356c997fc4620f2d6be4792fc1d29 Gerrit-Change-Number: 33843 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-gprs[master]: sndcp: Handle LL-ASSIGN.ind
by pespin 20 Jul '23

20 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33841 ) Change subject: sndcp: Handle LL-ASSIGN.ind ...................................................................... sndcp: Handle LL-ASSIGN.ind Change-Id: I924dcf3ac9cbb15e26a5e9376f89ca098ab49e0b --- M src/sndcp/sndcp_prim.c 1 file changed, 29 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/41/33841/1 diff --git a/src/sndcp/sndcp_prim.c b/src/sndcp/sndcp_prim.c index b234d3c..80dff8f 100644 --- a/src/sndcp/sndcp_prim.c +++ b/src/sndcp/sndcp_prim.c @@ -536,6 +536,23 @@ return rc; } +static int gprs_sndcp_prim_handle_llc_ll_assign_ind(struct osmo_gprs_llc_prim *llc_prim) +{ + struct gprs_sndcp_mgmt_entity *snme; + + snme = gprs_sndcp_snme_find_by_tlli(llc_prim->ll.tlli); + if (!snme) { + LOGSNDCP(LOGL_ERROR, "SNDCP-LL-ASSIGN.ind: Message for non-existing SNDCP Entity (TLLI=%08x)\n", + llc_prim->ll.tlli); + return -EIO; + } + + LOGSNME(snme, LOGL_INFO, "TLLI update 0x%08x -> 0x%08x\n", + llc_prim->ll.tlli, llc_prim->ll.assign_ind.tlli_new); + snme->tlli = llc_prim->ll.assign_ind.tlli_new; + return 0; +} + int gprs_sndcp_prim_lower_up_llc_ll(struct osmo_gprs_llc_prim *llc_prim) { int rc; @@ -553,6 +570,9 @@ case OSMO_PRIM(OSMO_GPRS_LLC_LL_XID, PRIM_OP_CONFIRM): rc = gprs_sndcp_prim_handle_llc_ll_xid_cnf(llc_prim); break; + case OSMO_PRIM(OSMO_GPRS_LLC_LL_ASSIGN, PRIM_OP_INDICATION): + rc = gprs_sndcp_prim_handle_llc_ll_assign_ind(llc_prim); + break; default: rc = gprs_sndcp_prim_handle_llc_ll_unsupported(llc_prim); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33841 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I924dcf3ac9cbb15e26a5e9376f89ca098ab49e0b Gerrit-Change-Number: 33841 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-gprs[master]: sm: Handle GMMSM-MODIFY.ind primitive
by pespin 20 Jul '23

20 Jul '23

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33811 to look at the new patch set (#6). Change subject: sm: Handle GMMSM-MODIFY.ind primitive ...................................................................... sm: Handle GMMSM-MODIFY.ind primitive Change-Id: Ic765b7a565cac4abcf34d8c6868e103971d17822 --- M include/osmocom/gprs/sm/sm_private.h M src/sm/sm.c M src/sm/sm_prim.c 3 files changed, 154 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/11/33811/6 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33811 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ic765b7a565cac4abcf34d8c6868e103971d17822 Gerrit-Change-Number: 33811 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in libosmo-gprs[master]: llc: Introduce LL-ASSIGN.ind
by pespin 20 Jul '23

20 Jul '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33840 ) Change subject: llc: Introduce LL-ASSIGN.ind ...................................................................... llc: Introduce LL-ASSIGN.ind TS 24.007, TS 24.008, TS 44.064 nor TS 44.065 explain how the TLLI update happening during GMM RAU propagates to the SNDCP layer. GMM only has interfaces towards LLC and GRR, and uses LLGMM-Assign.Req and GMMRR-Assign.req to update the TLLI in the respective layers. This patch adds a new primitive in the LL interface (LLC->SNDCP) LL-Assign.ind to propagate the LLGM-Assign.req received from GMM towards SNDCP, so that it can use the new TLLI in order to address the specific MS. Change-Id: Icb858f5397414b6d4183c21f13d35c0166ca7635 --- M include/osmocom/gprs/llc/llc_prim.h M include/osmocom/gprs/llc/llc_private.h M src/llc/llc_ll.c M src/llc/llc_llgmm.c M tests/llc/llc_prim_test.c 5 files changed, 61 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/40/33840/1 diff --git a/include/osmocom/gprs/llc/llc_prim.h b/include/osmocom/gprs/llc/llc_prim.h index c03f396..adcd22f 100644 --- a/include/osmocom/gprs/llc/llc_prim.h +++ b/include/osmocom/gprs/llc/llc_prim.h @@ -56,6 +56,7 @@ OSMO_GPRS_LLC_LL_DATA, /* Req/Ind/Cnf: TLLI, L3-PDU, Ref, QoS, Radio Prio */ OSMO_GPRS_LLC_LL_UNITDATA, /* Req/Ind: TLLI, L3-PDU, QoS, Radio Prio, Ciph, ... */ OSMO_GPRS_LLC_LL_STATUS, /* Ind: TLLI, Cause */ + OSMO_GPRS_LLC_LL_ASSIGN, /* Ind: TLLI old, TLLI new; Osmocom specific */ }; extern const struct value_string osmo_gprs_llc_ll_prim_type_names[]; @@ -214,6 +215,10 @@ struct { uint8_t cause; } status_ind; + /* OSMO_GPRS_LLC_LL_ASSIGN | Ind */ + struct { + uint32_t tlli_new; + } assign_ind; }; }; diff --git a/include/osmocom/gprs/llc/llc_private.h b/include/osmocom/gprs/llc/llc_private.h index 78e6e9f..44d32e2 100644 --- a/include/osmocom/gprs/llc/llc_private.h +++ b/include/osmocom/gprs/llc/llc_private.h @@ -297,6 +297,7 @@ uint8_t *l3_par, unsigned int l3_par_len); struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_xid_cnf(uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, uint8_t *l3_par, unsigned int l3_par_len); +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_assign_ind(uint32_t old_tlli, uint32_t new_tlli); struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_unitdata_ind( uint32_t tlli, enum osmo_gprs_llc_sapi ll_sapi, uint8_t *l3_pdu, size_t l3_pdu_len); @@ -305,7 +306,7 @@ int gprs_llc_lle_submit_prim_ll_xid_cnf(struct gprs_llc_lle *lle, const struct gprs_llc_xid_field *xid_field_response_l3, const struct gprs_llc_xid_field *xid_field_request_l3); - +int gprs_llc_llme_submit_prim_ll_assign_ind(uint32_t old_tlli, uint32_t new_tlli); /* llc_llgmm.c */ int gprs_llc_prim_llgmm_upper_down(struct osmo_gprs_llc_prim *llc_prim); diff --git a/src/llc/llc_ll.c b/src/llc/llc_ll.c index a13a7f5..b907299 100644 --- a/src/llc/llc_ll.c +++ b/src/llc/llc_ll.c @@ -40,6 +40,7 @@ { OSMO_GPRS_LLC_LL_DATA, "DATA" }, { OSMO_GPRS_LLC_LL_UNITDATA, "UNITDATA" }, { OSMO_GPRS_LLC_LL_STATUS, "STATUS" }, + { OSMO_GPRS_LLC_LL_ASSIGN, "ASSIGN" }, { 0, NULL } }; @@ -152,6 +153,17 @@ return llc_prim; } +/* LL-ASSIGN.ind (MS/SGSN): Osmocom specific, used to inform TLLI update LLC->SNDCP */ +struct osmo_gprs_llc_prim *gprs_llc_prim_alloc_ll_assign_ind(uint32_t old_tlli, uint32_t new_tlli) +{ + struct osmo_gprs_llc_prim *llc_prim; + llc_prim = llc_prim_ll_alloc(OSMO_GPRS_LLC_LL_ASSIGN, PRIM_OP_INDICATION, 0); + llc_prim->ll.tlli = old_tlli; + llc_prim->ll.sapi = OSMO_GPRS_LLC_SAPI_SNDCP3; /* any SNDCP SAPI is good */ + llc_prim->ll.assign_ind.tlli_new = new_tlli; + return llc_prim; +} + /******************************** * Handling to upper layers: ********************************/ @@ -192,6 +204,16 @@ return gprs_llc_prim_call_up_cb(llc_prim_tx); } + +int gprs_llc_llme_submit_prim_ll_assign_ind(uint32_t old_tlli, uint32_t new_tlli) +{ + struct osmo_gprs_llc_prim *llc_prim_tx; + llc_prim_tx = gprs_llc_prim_alloc_ll_assign_ind(old_tlli, new_tlli); + OSMO_ASSERT(llc_prim_tx); + + return gprs_llc_prim_call_up_cb(llc_prim_tx); +} + /******************************** * Handling from upper layers: ********************************/ diff --git a/src/llc/llc_llgmm.c b/src/llc/llc_llgmm.c index d85a30e..f33d6de 100644 --- a/src/llc/llc_llgmm.c +++ b/src/llc/llc_llgmm.c @@ -207,6 +207,9 @@ llme->old_tlli = old_tlli; llme->tlli = new_tlli; llme->state = OSMO_GPRS_LLC_LLMS_ASSIGNED; + /* Inform SNDCP about the TLLI change so it can update it too: */ + if (old_tlli != new_tlli) + gprs_llc_llme_submit_prim_ll_assign_ind(old_tlli, new_tlli); } else if (old_tlli != TLLI_UNASSIGNED && new_tlli == TLLI_UNASSIGNED) { /* TLLI Unassignment 8.3.3) */ llme->tlli = llme->old_tlli = 0; diff --git a/tests/llc/llc_prim_test.c b/tests/llc/llc_prim_test.c index bcba783..b9e2e0e 100644 --- a/tests/llc/llc_prim_test.c +++ b/tests/llc/llc_prim_test.c @@ -48,9 +48,17 @@ printf("%s(): Rx %s TLLI=0x%08x\n", __func__, pdu_name, llc_prim->llgmm.tlli); break; case OSMO_GPRS_LLC_SAP_LL: - printf("%s(): Rx %s TLLI=0x%08x SAPI=%s l3=[%s]\n", __func__, pdu_name, - llc_prim->ll.tlli, osmo_gprs_llc_sapi_name(llc_prim->ll.sapi), - osmo_hexdump(llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len)); + switch (OSMO_PRIM_HDR(&llc_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_LLC_LL_ASSIGN, PRIM_OP_INDICATION): + printf("%s(): Rx %s TLLI=0x%08x NEW_TLLI=x%08x\n", __func__, pdu_name, + llc_prim->ll.tlli, llc_prim->ll.assign_ind.tlli_new); + break; + default: + printf("%s(): Rx %s TLLI=0x%08x SAPI=%s l3=[%s]\n", __func__, pdu_name, + llc_prim->ll.tlli, osmo_gprs_llc_sapi_name(llc_prim->ll.sapi), + osmo_hexdump(llc_prim->ll.l3_pdu, llc_prim->ll.l3_pdu_len)); + break; + } break; default: printf("%s(): Unexpected Rx %s\n", __func__, pdu_name); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33840 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icb858f5397414b6d4183c21f13d35c0166ca7635 Gerrit-Change-Number: 33840 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmocom-bb[master]: trxcon/l1sched: implement CSD scheduling support
by fixeria 20 Jul '23

20 Jul '23

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32922 ) Change subject: trxcon/l1sched: implement CSD scheduling support ...................................................................... Patch Set 11: (1 comment) File src/host/trxcon/src/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmocom-bb/+/32922/comment/c5a9bdf4_df81bd7e PS11, Line 136: l1sched_lchan_meas_avg(lchan, 8); // XXX > did you intentionally leave this in? Thanks for the reminder. I remember about this problem. Fixing it would require some additional refactoring, so I will better fix this in a separate change. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32922 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0d7389a9a5f7019b9316ab1c0115797ff54a0e41 Gerrit-Change-Number: 32922 Gerrit-PatchSet: 11 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 09:59:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: trxcon/l1sched: emit DATA.cnf early (on bid=0)
by fixeria 20 Jul '23

20 Jul '23

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33749 ) Change subject: trxcon/l1sched: emit DATA.cnf early (on bid=0) ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie09a24cd950a93edd871a9fbc5b47ec96c24cceb Gerrit-Change-Number: 33749 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 09:56:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA
by pespin 20 Jul '23

20 Jul '23

Attention is currently required from: arehbein, laforge, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... Patch Set 10: (1 comment) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/f6bece45_83343488 PS10, Line 621: rc = clock_gettime(CLOCK_MONOTONIC, &start); > It looks like these are used to catch a timeout if the test hangs. See line 634 below. […] usually alarm() is used for this kind of stuff (exit process on timeout). -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 10 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 09:28:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA
by daniel 20 Jul '23

20 Jul '23

Attention is currently required from: arehbein, laforge, pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... Patch Set 10: (1 comment) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/b96b2b28_6ab6896d PS10, Line 621: rc = clock_gettime(CLOCK_MONOTONIC, &start); > osmo_clock_gettime() everywhere. It looks like these are used to catch a timeout if the test hangs. See line 634 below. In that case osmo_clock_gettime() would not work since it's overridden for the test. In libosmocore I used a limit on the number of iterations that osmo_select_main() can run which I think looks cleaner as you don't have to do any error handling of clock_gettime() -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 10 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 09:25:47 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: requirements: add pyshark to requirements lists
by dexter 20 Jul '23

20 Jul '23

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33831 ) Change subject: requirements: add pyshark to requirements lists ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > I am starting to worry about the amount of dependencies we require. […] How would you describe it then? I could remove the dependency from setup.py and requirements.txt and add a note in README.md. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33831 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I885c7210aac3774a5f1f5201903ad2bff94c3120 Gerrit-Change-Number: 33831 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 20 Jul 2023 09:06:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Components: add compatibility for PCU_IF_SAPI_PCH_DT
by dexter 20 Jul '23

20 Jul '23

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33795 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: PCUIF_Components: add compatibility for PCU_IF_SAPI_PCH_DT ...................................................................... PCUIF_Components: add compatibility for PCU_IF_SAPI_PCH_DT When we receive a PCUIF_DATA_REQ, f_BTS_CT_handler will mangle the incoming message for us. The resulting BTS_CCCH_Block that is sent up to the component not only contains the PCUIF message, but will also have the already parsed MAC block attached. This currently only works for PCU_IF_SAPI_PCH, but not for PCU_IF_SAPI_PCH_DT. Let's add compatibility for PCU_IF_SAPI_PCH_DT. Related: OS#5927 Change-Id: Ibaa6d170ef0f1f61b708a872a3c2364585063503 --- M pcu/PCUIF_Components.ttcn 1 file changed, 39 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index 375af8e..8a1207a 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -20,6 +20,7 @@ import from PCUIF_CodecPort all; import from Osmocom_Types all; +import from General_Types all; import from RLCMAC_Types all; import from GSM_RR_Types all; @@ -139,6 +140,8 @@ type record BTS_CCCH_Block { uint8_t bts_nr, PCUIF_data raw, + OCT4 tlli optional, + charstring imsi optional, GsmRrMessage rr_msg }; template BTS_PDTCH_Block tr_PCUIF_DATA_PDTCH(template uint8_t bts_nr, @@ -157,9 +160,13 @@ }; template BTS_CCCH_Block tr_PCUIF_DATA_RR(template uint8_t bts_nr, template PCUIF_data raw, - template GsmRrMessage rr_msg := ?) := { + template GsmRrMessage rr_msg := ?, + template OCT4 tlli := *, + template charstring imsi := *) := { bts_nr := bts_nr, raw := raw, + tlli := tlli, + imsi := imsi, rr_msg := rr_msg }; @@ -492,7 +499,7 @@ /* Wait until the PCU is connected */ PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT)); - var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_AGCH); + var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_PCH_DT, PCU_IF_SAPI_AGCH); alt { /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */ [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg { @@ -530,6 +537,7 @@ } [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := tr_ccch_sapi)) -> value pcu_msg { var octetstring data; + var PCUIF_pch_dt pch_dt; /* On PCH the payload is prefixed with paging group (3 octets): skip it. * TODO: add an additional template parameter, so we can match it. */ if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) { @@ -539,7 +547,17 @@ } pcu_msg_rr.bts_nr := bts_nr; pcu_msg_rr.raw := pcu_msg.u.data_req; - pcu_msg_rr.rr_msg := dec_GsmRrMessage(data); + + if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_PCH_DT) { + pch_dt := dec_PCUIF_pch_dt(pcu_msg_rr.raw.data); + pcu_msg_rr.tlli := pch_dt.tlli; + pcu_msg_rr.imsi := pch_dt.imsi; + pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch_dt.data); + } else { + pcu_msg_rr.tlli := omit; + pcu_msg_rr.imsi := omit; + pcu_msg_rr.rr_msg := dec_GsmRrMessage(data); + } TC.send(pcu_msg_rr); repeat; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33795 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: Ibaa6d170ef0f1f61b708a872a3c2364585063503 Gerrit-Change-Number: 33795 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: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0