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

[L] Change in osmo-hlr[master]: Add support for multiple APN profiles for subscriber data
by dexter 09 Jun '23

09 Jun '23

Attention is currently required from: neels, laforge, lynxis lazus. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/32512 ) Change subject: Add support for multiple APN profiles for subscriber data ...................................................................... Patch Set 10: (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-hlr/+/32512/comment/72a00aa4_bd0bd496 PS7, Line 11: This violates the spec > No. The spec which this is about. I haven't found it again. Sorry. I do not think that this is critical. https://gerrit.osmocom.org/c/osmo-hlr/+/32512/comment/1a654e1b_c1fbe49b PS7, Line 17: premium > premium means just a different profile. E.g. […] Done File include/osmocom/hlr/hlr.h: https://gerrit.osmocom.org/c/osmo-hlr/+/32512/comment/de2738d3_57e51bfd PS10, Line 67: } pdp_profile; > There might be different ps related settings in the future. Done -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/32512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I540132ee5dcfd09f4816e02e702927e1074ca50f Gerrit-Change-Number: 32512 Gerrit-PatchSet: 10 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 09 Jun 2023 15:47:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-pcu[master]: tbf_{dl,ul}_fsm: Remove unneeded asserts
by pespin 09 Jun '23

09 Jun '23

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/33260 ) Change subject: tbf_{dl,ul}_fsm: Remove unneeded asserts ...................................................................... tbf_{dl,ul}_fsm: Remove unneeded asserts Those are leftovers from the time where we had a single tbf_fsm for both UL and DL TBF. Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea --- M src/tbf_dl_fsm.c M src/tbf_ul_fsm.c 2 files changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/60/33260/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea Gerrit-Change-Number: 33260 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-pcu[master]: tbf_dl_fsm: Remove unneeded asserts
by pespin 09 Jun '23

09 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33260 ) Change subject: tbf_dl_fsm: Remove unneeded asserts ...................................................................... tbf_dl_fsm: Remove unneeded asserts Those are leftovers from the time where we had a single tbf_fsm for both UL and DL TBF. Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea --- M src/tbf_dl_fsm.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/60/33260/1 diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c index 3ab1c53..d792fa2 100644 --- a/src/tbf_dl_fsm.c +++ b/src/tbf_dl_fsm.c @@ -245,7 +245,6 @@ switch (event) { case TBF_EV_DL_ACKNACK_MISS: - OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); break; case TBF_EV_FINAL_ACK_RECVD: /* We received Final Ack (DL ACK/NACK) from MS. move to @@ -295,7 +294,6 @@ struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv; switch (event) { case TBF_EV_DL_ACKNACK_MISS: - OSMO_ASSERT(tbf_direction(ctx->tbf) == GPRS_RLCMAC_DL_TBF); /* Ignore, we don't care about missed DL ACK/NACK poll timeouts * anymore, we are already releasing the TBF */ break; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33260 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I99359b8cb655b26ac2058f457423fdec178744ea Gerrit-Change-Number: 33260 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequ...
by pespin 09 Jun '23

09 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33259 ) Change subject: tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequence ...................................................................... tbf_dl_fsm: Remove T3169 references, simplify T3195 set up as consequence T3169 is triggered as consequence of N3101 and N303 reaching MAX. Those counters are related to UL TBF only, and hence T3169 also only applies to UL TBFs. The references to T3169 were there as a remains from time where we had a single tbf_fsm for both UL and DL TBFs. It can now be further simplified. Change-Id: I02f7654518da617ce6704d807d34761dbadecf07 --- M src/tbf_dl_fsm.c M src/tbf_fsm.h 2 files changed, 19 insertions(+), 23 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/59/33259/1 diff --git a/src/tbf_dl_fsm.c b/src/tbf_dl_fsm.c index a0e47b7..3ab1c53 100644 --- a/src/tbf_dl_fsm.c +++ b/src/tbf_dl_fsm.c @@ -35,7 +35,7 @@ [TBF_ST_FLOW] = {}, [TBF_ST_FINISHED] = {}, [TBF_ST_WAIT_RELEASE] = { .T = 3193 }, - [TBF_ST_RELEASING] = {}, + [TBF_ST_RELEASING] = { .T = 3195 }, }; /* Transition to a state, using the T timer defined in tbf_dl_fsm_timeouts. @@ -192,7 +192,6 @@ case TBF_EV_MAX_N3105: /* We are going to release, so abort any Pkt Ul Ass pending to be scheduled: */ osmo_fsm_inst_dispatch(tbf_ul_ass_fi(ctx->tbf), TBF_UL_ASS_EV_ABORT, NULL); - ctx->T_release = 3195; tbf_dl_fsm_state_chg(fi, TBF_ST_RELEASING); break; default: @@ -233,7 +232,6 @@ tbf_dl_fsm_state_chg(fi, TBF_ST_WAIT_RELEASE); break; case TBF_EV_MAX_N3105: - ctx->T_release = 3195; tbf_dl_fsm_state_chg(fi, TBF_ST_RELEASING); break; default: @@ -256,7 +254,6 @@ tbf_dl_fsm_state_chg(fi, TBF_ST_WAIT_RELEASE); break; case TBF_EV_MAX_N3105: - ctx->T_release = 3195; tbf_dl_fsm_state_chg(fi, TBF_ST_RELEASING); break; default: @@ -273,13 +270,11 @@ static void st_wait_release(struct osmo_fsm_inst *fi, uint32_t event, void *data) { - struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv; switch (event) { case TBF_EV_FINAL_ACK_RECVD: /* ignore, duplicate ACK, we already know about since we are in WAIT_RELEASE */ break; case TBF_EV_MAX_N3105: - ctx->T_release = 3195; tbf_dl_fsm_state_chg(fi, TBF_ST_RELEASING); break; default: @@ -289,22 +284,10 @@ static void st_releasing_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { - struct tbf_dl_fsm_ctx *ctx = (struct tbf_dl_fsm_ctx *)fi->priv; - unsigned long val; - - if (!ctx->T_release) - return; - - /* In general we should end up here with an assigned timer in ctx->T_release. Possible values are: - * T3195: Wait for reuse of TFI(s) when there is no response from the MS - * (radio failure or cell change) for this TBF/MBMS radio bearer. - * T3169: Wait for reuse of USF and TFI(s) after the MS uplink assignment for this TBF is invalid. + /* T3195 has been set entering this state: Wait for reuse of TFI(s) when + * there is no response from the MS (radio failure or cell change) for this + * TBF/MBMS radio bearer. Upon timeout, the timer_cb does tbf_free(). */ - val = osmo_tdef_get(tbf_ms(ctx->tbf)->bts->T_defs_bts, ctx->T_release, OSMO_TDEF_S, -1); - fi->T = ctx->T_release; - LOGPTBFDL(ctx->dl_tbf, LOGL_DEBUG, "starting timer T%u with %lu sec. %u microsec\n", - ctx->T_release, val, 0); - osmo_timer_schedule(&fi->timer, val, 0); } static void st_releasing(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -362,7 +345,6 @@ case -2001: LOGPTBFDL(ctx->dl_tbf, LOGL_NOTICE, "releasing due to PACCH assignment timeout.\n"); /* fall-through */ - case 3169: case 3193: case 3195: tbf_free(ctx->tbf); diff --git a/src/tbf_fsm.h b/src/tbf_fsm.h index 2bdacc5..6e9e478 100644 --- a/src/tbf_fsm.h +++ b/src/tbf_fsm.h @@ -62,7 +62,6 @@ struct gprs_rlcmac_dl_tbf *dl_tbf; }; uint32_t state_flags; - unsigned int T_release; /* Timer to be used to end release: T3169 or T3195 */ }; struct tbf_ul_fsm_ctx { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33259 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I02f7654518da617ce6704d807d34761dbadecf07 Gerrit-Change-Number: 33259 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-pcu[master]: Avoid using N3101 in DL TBFs
by pespin 09 Jun '23

09 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33258 ) Change subject: Avoid using N3101 in DL TBFs ...................................................................... Avoid using N3101 in DL TBFs TS 44.060 13.4 "N3101" clearly states this counter relates to UL TBFs, since it only applies to TBFs for which USFs are set: "When the network after setting USF for a given TBF, receives a valid data block of this TBF from the mobile station in a block assigned for this USF, it will reset counter N3101. If PS Handover is not ongoing, the network will increment counter N3101 for each USF for which no data is received for this TBF." Furthermore, N3101 must only be reset for data blocks, so drop all rx CTRL block patches on UL TBF resetting the counter. Change-Id: I207f3906d13fc6feea2282e261f468a09db37d86 --- M src/pdch.cpp M src/tbf.cpp 2 files changed, 29 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/58/33258/1 diff --git a/src/pdch.cpp b/src/pdch.cpp index 9ceb944..2cee011 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -356,9 +356,6 @@ tbf = poll->tbf_poll.poll_tbf; reason = poll->tbf_poll.reason; - /* Reset N3101 counter: */ - tbf->n_reset(N3101); - ms_update_announced_tlli(tbf->ms(), tlli); /* Gather MS from TBF again, since it may be NULL or may have been merged during ms_update_announced_tlli */ ms = tbf->ms(); @@ -499,9 +496,6 @@ return; } - /* Reset N3101 counter: */ - tbf->n_reset(N3101); - pdch_ulc_release_fn(ulc, fn); LOGPTBF(tbf, LOGL_DEBUG, "RX: [PCU <- BTS] Packet Downlink Ack/Nack\n"); @@ -569,8 +563,6 @@ return; } - /* Reset N3101 counter: */ - tbf->n_reset(N3101); pdch_ulc_release_fn(ulc, fn); LOGPTBF(tbf, LOGL_DEBUG, @@ -670,8 +662,6 @@ LOGP(DRLCMAC, LOGL_NOTICE, "PACKET RESOURCE REQ unknown downlink TFI=%d\n", tfi); return; } - /* Reset N3101 counter: */ - dl_tbf->n_reset(N3101); ms = tbf_ms(dl_tbf_as_tbf(dl_tbf)); dl_tbf = NULL; } else { /* ID_TYPE = UL_TFI */ @@ -681,8 +671,6 @@ LOGP(DRLCMAC, LOGL_NOTICE, "PACKET RESOURCE REQ unknown uplink TFI=%d\n", tfi); return; } - /* Reset N3101 counter: */ - ul_tbf->n_reset(N3101); ms = tbf_ms(ul_tbf_as_tbf(ul_tbf)); ul_tbf = NULL; } diff --git a/src/tbf.cpp b/src/tbf.cpp index 83b3b86..bc5411a 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -307,10 +307,14 @@ void gprs_rlcmac_tbf::n_reset(enum tbf_counters n) { - if (n >= N_MAX) { - LOGPTBF(this, LOGL_ERROR, "attempting to reset unknown counter %s\n", - get_value_string(tbf_counters_names, n)); - return; + OSMO_ASSERT(n < N_MAX); + + switch(n) { + case N3101: + OSMO_ASSERT(direction == GPRS_RLCMAC_UL_TBF); + break; + default: + break; } Narr[n] = 0; @@ -321,16 +325,13 @@ { uint8_t chk; - if (n >= N_MAX) { - LOGPTBF(this, LOGL_ERROR, "attempting to increment unknown counter %s\n", - get_value_string(tbf_counters_names, n)); - return true; - } + OSMO_ASSERT(n < N_MAX); Narr[n]++; switch(n) { case N3101: + OSMO_ASSERT(direction == GPRS_RLCMAC_UL_TBF); chk = bts->n3101; break; case N3103: -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33258 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I207f3906d13fc6feea2282e261f468a09db37d86 Gerrit-Change-Number: 33258 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-pcu[master]: tbf_dl_fsm: Apply T3193 using FSM infrastructure instead of manually
by laforge 09 Jun '23

09 Jun '23

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33257 ) Change subject: tbf_dl_fsm: Apply T3193 using FSM infrastructure instead of manually ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33257 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ic2a9d4b3c812c1533b2b7f97f27799b28b636c21 Gerrit-Change-Number: 33257 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 09 Jun 2023 15:08:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: Add codec list to *VGCS_VBS_AssignmentReq templates
by laforge 09 Jun '23

09 Jun '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33146 ) Change subject: Add codec list to *VGCS_VBS_AssignmentReq templates ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33146 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: Id3ce78ad795c418650ca924a953294c3380b8198 Gerrit-Change-Number: 33146 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 09 Jun 2023 15:07:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add template to receive ChannelType IE
by laforge 09 Jun '23

09 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33145 ) Change subject: BSSMAP_Templates: Add template to receive ChannelType IE ...................................................................... BSSMAP_Templates: Add template to receive ChannelType IE Change-Id: Ia6f283c17a1687ee65f8997bbeba0b09d1a462cf --- M library/BSSMAP_Templates.ttcn 1 file changed, 20 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index fca051a..f8cb395 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -566,6 +566,17 @@ speechId_DataIndicator := Spdi_TCHF_FR } +template (present) BSSMAP_IE_ChannelType tr_BSSMAP_IE_ChannelType(template (present) BIT4 speech_data_ind, + template (present) OCT1 chan_rate_type, + template (present) octetstring speech_id) := { + elementIdentifier := '0B'O, + lengthIndicator := ?, + speechOrDataIndicator := speech_data_ind, + spare1_4 := '0000'B, + channelRateAndType := chan_rate_type, + speechId_DataIndicator := speech_id +} + template (value) BSSMAP_IE_ChannelType ts_BSSMAP_IE_ChannelTypeCTM modifies ts_BSSMAP_IE_ChannelType := { speechOrDataIndicator := '0100'B /* speech + CTM */ } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33145 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: Ia6f283c17a1687ee65f8997bbeba0b09d1a462cf Gerrit-Change-Number: 33145 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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

1 0

[M] Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add templates to receive CellID IE
by laforge 09 Jun '23

09 Jun '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33144 ) Change subject: BSSMAP_Templates: Add templates to receive CellID IE ...................................................................... BSSMAP_Templates: Add templates to receive CellID IE Change-Id: I42d52d871c8011db7e0897dfe752afeefa6d9662 --- M library/BSSMAP_Templates.ttcn 1 file changed, 99 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn index c564cfd..fca051a 100644 --- a/library/BSSMAP_Templates.ttcn +++ b/library/BSSMAP_Templates.ttcn @@ -349,6 +349,14 @@ cellIdentification := ? } +template BSSMAP_IE_CellIdentifier tr_BSSMAP_IE_CellID := { + elementIdentifier := '05'O, + lengthIndicator := ?, + cellIdentifierDiscriminator := ?, + spare1_4 := '0000'B, + cellIdentification := ? +} + type uint16_t BssmapLAC; type uint16_t BssmapCI; type uint16_t BssmapSAC; @@ -360,6 +368,15 @@ } } +template (present) BSSMAP_IE_CellIdentifier tr_CellId_CGI(template (present) OCT3 mcc_mnc, + template (present) BssmapLAC lac, + template (present) BssmapCI ci) +modifies tr_BSSMAP_IE_CellID := { + cellIdentification := { + cI_CGI := tr_BSSMAP_CI_CGI(mcc_mnc, lac, ci) + } +} + template (value) BSSMAP_IE_CellIdentifier ts_CellID_LAC_CI(BssmapLAC lac, BssmapCI ci) modifies ts_BSSMAP_IE_CellID := { cellIdentification := { @@ -370,6 +387,17 @@ } } +template (present) BSSMAP_IE_CellIdentifier tr_CellID_LAC_CI(template (present) BssmapLAC lac, + template (present) BssmapCI ci) +modifies tr_BSSMAP_IE_CellID := { + cellIdentification := { + cI_LAC_CI := { + lac := f_tr_LAC(lac), + ci := f_tr_CI(ci) + } + } +} + template BSSMAP_IE_CellIdentifier ts_CellId_CI(BssmapCI ci) modifies ts_BSSMAP_IE_CellID := { cellIdentification := { @@ -377,6 +405,13 @@ } } +template (present) BSSMAP_IE_CellIdentifier tr_CellId_CI(template (present) BssmapCI ci) +modifies tr_BSSMAP_IE_CellID := { + cellIdentification := { + cI_CI := f_tr_CI(ci) + } +} + template BSSMAP_IE_CellIdentifier ts_CellId_none modifies ts_BSSMAP_IE_CellID := { cellIdentification := { @@ -384,6 +419,13 @@ } } +template BSSMAP_IE_CellIdentifier tr_CellId_none +modifies tr_BSSMAP_IE_CellID := { + cellIdentification := { + cI_noCell := ''O + } +} + template (value) BSSMAP_IE_CellIdentifier ts_CellID_SAI(OCT3 mcc_mnc, BssmapLAC lac, BssmapSAC sac) modifies ts_BSSMAP_IE_CellID := { cellIdentification := { @@ -395,6 +437,46 @@ } } +template (present) BSSMAP_IE_CellIdentifier tr_CellID_SAI(template (present) OCT3 mcc_mnc, + template (present) BssmapLAC lac, + template (present) BssmapSAC sac) +modifies tr_BSSMAP_IE_CellID := { + cellIdentification := { + cI_SAI := { + mcc_mnc := mcc_mnc, + lac := f_tr_LAC(lac), + sac := f_tr_SAC(sac) + } + } +} + +private function f_tr_LAC(template (present) BssmapLAC lac) +return template (present) OCT2 { + if (istemplatekind(lac, "?")) { + return ?; + } else { + return int2oct(valueof(lac), 2); + } +} + +private function f_tr_SAC(template (present) BssmapSAC sac) +return template (present) OCT2 { + if (istemplatekind(sac, "?")) { + return ?; + } else { + return int2oct(valueof(sac), 2); + } +} + +private function f_tr_CI(template (present) BssmapCI ci) +return template (present) OCT2 { + if (istemplatekind(ci, "?")) { + return ?; + } else { + return int2oct(valueof(ci), 2); + } +} + template (value) BSSMAP_IE_Layer3Information ts_BSSMAP_IE_L3Info(template (value) octetstring l3info) := { elementIdentifier := '17'O, @@ -1381,6 +1463,14 @@ ci := int2oct(ci, 2) } +template (present) BSSMAP_FIELD_CellIdentification_CGI tr_BSSMAP_CI_CGI(template (present) OCT3 mcc_mnc, + template (present) GsmLac lac, + template (present) GsmCellId ci) := { + mcc_mnc := mcc_mnc, + lac := f_tr_LAC(lac), + ci := f_tr_CI(ci) +} + template (value) BSSMAP_FIELD_CellIdentification_LAC_CI ts_BSSMAP_CI_LAC_CI(GsmLac lac, GsmCellId ci) := { lac := int2oct(lac, 2), ci := int2oct(ci, 2) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33144 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: I42d52d871c8011db7e0897dfe752afeefa6d9662 Gerrit-Change-Number: 33144 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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

1 0

[S] Change in osmo-ttcn3-hacks[master]: BSSMAP_Templates: Add template to receive ChannelType IE
by laforge 09 Jun '23

09 Jun '23

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33145 ) Change subject: BSSMAP_Templates: Add template to receive ChannelType IE ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33145 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: Ia6f283c17a1687ee65f8997bbeba0b09d1a462cf Gerrit-Change-Number: 33145 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 09 Jun 2023 15:07:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0