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

Change in osmo-bts[master]: osmux: Fix null ptr dereference sending UL data before the remote is ...

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/29908 ) Change subject: osmux: Fix null ptr dereference sending UL data before the remote is configured ...................................................................... Patch Set 1: Code-Review-1 (1 comment) File src/common/osmux.c: https://gerrit.osmocom.org/c/osmo-bts/+/29908/comment/add7adf4_1eaf595e PS1, Line 498: return -1; You leak msg here. Maybe move this check before calling osmo_rtp_build()? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/29908 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I5d7971c0ed9b22d35d8965af54031a43c6388762 Gerrit-Change-Number: 29908 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Oct 2022 19:44:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-msc[master]: vlr_loc_update(): drop bogus check

by neels

neels has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29693 ) Change subject: vlr_loc_update(): drop bogus check ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ia1b5d5d308746651a41612f46a988f41acd0a269 Gerrit-Change-Number: 29693 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 7 months

1
0
0 0

Change in libosmocore[master]: add gsm0808_amr_modes_from_cfg

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29473 ) Change subject: add gsm0808_amr_modes_from_cfg ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: pong, my focus is currently on osmo-msc's side of codecs. This patch closely relates to that "[RFC]" patch, would make sense to submit them together. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29473 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Icef7dd626d3d4641c66b8dd87e2047fc0ab547d1 Gerrit-Change-Number: 29473 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 28 Oct 2022 19:08:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 7 months

1
0
0 0

Change in osmo-mgw[master]: AMR->IuUP: log conversion, like for the flipside

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29857 ) Change subject: AMR->IuUP: log conversion, like for the flipside ...................................................................... AMR->IuUP: log conversion, like for the flipside For IuUP -> AMR, we log a message like Convert IuUP -> AMR OA:... Do the same for the direction AMR -> IuUP. Related: SYS#5092 Change-Id: I525685a7dedb6d5d1deecbd026844cbe23193fac --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 95487fc..9779692 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -683,6 +683,8 @@ irp->u.data.fqc = amr_hdr->q ? IUUP_FQC_FRAME_GOOD : IUUP_FQC_FRAME_BAD; irp->u.data.rfci = rfci; msgb_pull(msg, 2); + LOGP(DLMGCP, LOGL_DEBUG, "Convert AMR OA -> IuUP: ft %d -> rfci %d len %d\n", + amr_hdr->ft, rfci, msgb_length(msg)); } else { uint8_t *amr_bwe_hdr = (uint8_t *) msgb_data(msg); int8_t ft; @@ -710,6 +712,8 @@ return rc; } msgb_trim(msg, iuup_length); + LOGP(DLMGCP, LOGL_DEBUG, "Convert AMR BE -> IuUP: ft %d -> rfci %d len %d\n", + ft, rfci, msgb_length(msg)); } irp->oph.msg->l3h = msgb_put(irp->oph.msg, msgb_length(msg)); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I525685a7dedb6d5d1deecbd026844cbe23193fac Gerrit-Change-Number: 29857 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-msc[master]: SMPP: fix possible NULL pointer dereference

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28848 ) Change subject: SMPP: fix possible NULL pointer dereference ...................................................................... SMPP: fix possible NULL pointer dereference Related: OS#5568 Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 --- M src/libsmpputil/smpp_smsc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libsmpputil/smpp_smsc.c b/src/libsmpputil/smpp_smsc.c index 059915d..0ee5b62 100644 --- a/src/libsmpputil/smpp_smsc.c +++ b/src/libsmpputil/smpp_smsc.c @@ -163,8 +163,8 @@ osmo_fd_unregister(&esme->wqueue.bfd); close(esme->wqueue.bfd.fd); esme->wqueue.bfd.fd = -1; - acl->esme = NULL; smpp_esme_put(acl->esme); + acl->esme = NULL; } /* delete all routes for this ACL */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28848 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I875eb5249004d3a960aee46c5099592d18fcaa76 Gerrit-Change-Number: 28848 Gerrit-PatchSet: 40 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-pcu[master]: encoding: Use MT_PACKET_UPLINK_ASSIGNMENT define instead of hardcoded...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29911 ) Change subject: encoding: Use MT_PACKET_UPLINK_ASSIGNMENT define instead of hardcoded value ...................................................................... encoding: Use MT_PACKET_UPLINK_ASSIGNMENT define instead of hardcoded value Change-Id: I05b39d3183fdf741d648a15ff803d20e324443af --- M src/encoding.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, approved diff --git a/src/encoding.cpp b/src/encoding.cpp index 278da72..74b80c1 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -605,7 +605,7 @@ /* See 3GPP TS 44.060, section 11.2.29 */ pua = &block->u.Packet_Uplink_Assignment; - pua->MESSAGE_TYPE = 0x0a; // Packet Uplink Assignment + pua->MESSAGE_TYPE = MT_PACKET_UPLINK_ASSIGNMENT; // Packet Uplink Assignment pua->PAGE_MODE = 0x00; // Normal Paging /* TLLI or Global (UL/DL) TFI */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I05b39d3183fdf741d648a15ff803d20e324443af Gerrit-Change-Number: 29911 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-pcu[master]: rcv_resource_request(): Validate expected message before MS lookup & ...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29910 ) Change subject: rcv_resource_request(): Validate expected message before MS lookup & allocation ...................................................................... rcv_resource_request(): Validate expected message before MS lookup & allocation There's no sense if doing the lookup and allocation if the message is not expected, it will be unrefed (freed) afterwards anyway. Moreover, this way we avoid doing stuff for the WIP code paths which act on different request ID than TLLI. Change-Id: I4be8858230a2eebdb33260093d082a005cb9fcd4 --- M src/pdch.cpp 1 file changed, 7 insertions(+), 7 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pdch.cpp b/src/pdch.cpp index 369406f..defb6b2 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -644,10 +644,16 @@ struct gprs_rlcmac_sba *sba; int rc; struct gprs_rlcmac_bts *bts = trx->bts; + struct pdch_ulc_node *item; + + if (!(item = pdch_ulc_get_node(ulc, fn))) { + LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: " + "UL block not reserved\n", fn); + return; + } if (request->ID.UnionType) { struct gprs_rlcmac_ul_tbf *ul_tbf = NULL; - struct pdch_ulc_node *item; uint32_t tlli = request->ID.u.TLLI; GprsMs *ms = bts_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); @@ -659,12 +665,6 @@ /* Keep the ms, even if it gets idle temporarily */ ms_ref(ms); - if (!(item = pdch_ulc_get_node(ulc, fn))) { - LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: " - "UL block not reserved\n", fn); - goto return_unref; - } - switch (item->type) { case PDCH_ULC_NODE_TBF_USF: /* Is it actually valid for an MS to send a PKT Res Req during USF? */ -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29910 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4be8858230a2eebdb33260093d082a005cb9fcd4 Gerrit-Change-Number: 29910 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-pcu[master]: use new {dl,ul}_tbf_as_tbf(_const) helper functions

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29900 ) Change subject: use new {dl,ul}_tbf_as_tbf(_const) helper functions ...................................................................... use new {dl,ul}_tbf_as_tbf(_const) helper functions Change-Id: I223d9d5823c90ff31089420d35a7bf0fe1ebf870 --- M src/bts.cpp M src/gprs_ms.c M src/pdch_ul_controller.c M src/tbf_ul_ass_fsm.c 4 files changed, 27 insertions(+), 27 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/bts.cpp b/src/bts.cpp index ae63a12..2389987 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -461,7 +461,7 @@ ms = llist_entry(tmp, typeof(*ms), list); struct gprs_rlcmac_tbf *tbfs[] = { ms->ul_tbf, ms->dl_tbf }; for (l = 0; l < ARRAY_SIZE(tbfs); l++) { - tbf = (struct gprs_rlcmac_tbf *)tbfs[l]; + tbf = tbfs[l]; if (!tbf) continue; first_ts = -1; diff --git a/src/gprs_ms.c b/src/gprs_ms.c index 0ccedb3..f4da3a5 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -93,7 +93,7 @@ if (!dl_tbf) return; - if (tbf_state((const struct gprs_rlcmac_tbf *)dl_tbf) != TBF_ST_FLOW) + if (tbf_state(dl_tbf_as_tbf_const(dl_tbf)) != TBF_ST_FLOW) return; LOGPTBFDL(dl_tbf, LOGL_DEBUG, "LLC receive timeout, requesting DL ACK\n"); @@ -162,12 +162,12 @@ osmo_timer_del(&ms->timer); if (ms->ul_tbf) { - tbf_set_ms((struct gprs_rlcmac_tbf *)ms->ul_tbf, NULL); + tbf_set_ms(ul_tbf_as_tbf(ms->ul_tbf), NULL); ms->ul_tbf = NULL; } if (ms->dl_tbf) { - tbf_set_ms((struct gprs_rlcmac_tbf *)ms->dl_tbf, NULL); + tbf_set_ms(dl_tbf_as_tbf(ms->dl_tbf), NULL); ms->dl_tbf = NULL; } @@ -311,7 +311,7 @@ ms_ref(ms); if (ms->ul_tbf) - llist_add_tail(tbf_ms_list((struct gprs_rlcmac_tbf *)ms->ul_tbf), &ms->old_tbfs); + llist_add_tail(tbf_ms_list(ul_tbf_as_tbf(ms->ul_tbf)), &ms->old_tbfs); ms->ul_tbf = tbf; @@ -331,7 +331,7 @@ ms_ref(ms); if (ms->dl_tbf) - llist_add_tail(tbf_ms_list((struct gprs_rlcmac_tbf *)ms->dl_tbf), &ms->old_tbfs); + llist_add_tail(tbf_ms_list(dl_tbf_as_tbf(ms->dl_tbf)), &ms->old_tbfs); ms->dl_tbf = tbf; @@ -845,7 +845,7 @@ /* If the DL TBF is active, add number of unencoded chunk octets */ if (ms->dl_tbf) - unencoded_octets += llc_chunk_size(tbf_llc((struct gprs_rlcmac_tbf *)ms->dl_tbf)); + unencoded_octets += llc_chunk_size(tbf_llc(dl_tbf_as_tbf(ms->dl_tbf))); /* There are many unencoded octets, don't reduce */ if (unencoded_octets >= the_pcu->vty.cs_downgrade_threshold) @@ -868,10 +868,10 @@ int ms_first_common_ts(const struct GprsMs *ms) { if (ms->dl_tbf) - return tbf_first_common_ts((struct gprs_rlcmac_tbf *)ms->dl_tbf); + return tbf_first_common_ts(dl_tbf_as_tbf(ms->dl_tbf)); if (ms->ul_tbf) - return tbf_first_common_ts((struct gprs_rlcmac_tbf *)ms->ul_tbf); + return tbf_first_common_ts(ul_tbf_as_tbf(ms->ul_tbf)); return -1; } @@ -881,10 +881,10 @@ uint8_t slots = 0; if (ms->dl_tbf) - slots |= tbf_dl_slots((struct gprs_rlcmac_tbf *)ms->dl_tbf); + slots |= tbf_dl_slots(dl_tbf_as_tbf(ms->dl_tbf)); if (ms->ul_tbf) - slots |= tbf_dl_slots((struct gprs_rlcmac_tbf *)ms->ul_tbf); + slots |= tbf_dl_slots(ul_tbf_as_tbf(ms->ul_tbf)); return slots; } @@ -894,10 +894,10 @@ uint8_t slots = 0; if (ms->dl_tbf) - slots |= tbf_ul_slots((struct gprs_rlcmac_tbf *)ms->dl_tbf); + slots |= tbf_ul_slots(dl_tbf_as_tbf(ms->dl_tbf)); if (ms->ul_tbf) - slots |= tbf_ul_slots((struct gprs_rlcmac_tbf *)ms->ul_tbf); + slots |= tbf_ul_slots(ul_tbf_as_tbf(ms->ul_tbf)); return slots; } @@ -906,20 +906,20 @@ { uint8_t slots = 0; - bool is_dl_active = ms->dl_tbf && tbf_is_tfi_assigned((struct gprs_rlcmac_tbf *)ms->dl_tbf); - bool is_ul_active = ms->ul_tbf && tbf_is_tfi_assigned((struct gprs_rlcmac_tbf *)ms->ul_tbf); + bool is_dl_active = ms->dl_tbf && tbf_is_tfi_assigned(dl_tbf_as_tbf(ms->dl_tbf)); + bool is_ul_active = ms->ul_tbf && tbf_is_tfi_assigned(ul_tbf_as_tbf(ms->ul_tbf)); if (!is_dl_active && !is_ul_active) return 0; /* see TS 44.060, 8.1.1.2.2 */ if (is_dl_active && !is_ul_active) - slots = tbf_dl_slots((struct gprs_rlcmac_tbf *)ms->dl_tbf); + slots = tbf_dl_slots(dl_tbf_as_tbf(ms->dl_tbf)); else if (!is_dl_active && is_ul_active) - slots = tbf_ul_slots((struct gprs_rlcmac_tbf *)ms->ul_tbf); + slots = tbf_ul_slots(ul_tbf_as_tbf(ms->ul_tbf)); else - slots = tbf_ul_slots((struct gprs_rlcmac_tbf *)ms->ul_tbf) & - tbf_dl_slots((struct gprs_rlcmac_tbf *)ms->dl_tbf); + slots = tbf_ul_slots(ul_tbf_as_tbf(ms->ul_tbf)) & + tbf_dl_slots(dl_tbf_as_tbf(ms->dl_tbf)); /* Assume a multislot class 1 device */ /* TODO: For class 2 devices, this could be removed */ @@ -953,8 +953,8 @@ struct gprs_rlcmac_tbf *ms_tbf(const struct GprsMs *ms, enum gprs_rlcmac_tbf_direction dir) { switch (dir) { - case GPRS_RLCMAC_DL_TBF: return (struct gprs_rlcmac_tbf *)ms->dl_tbf; - case GPRS_RLCMAC_UL_TBF: return (struct gprs_rlcmac_tbf *)ms->ul_tbf; + case GPRS_RLCMAC_DL_TBF: return dl_tbf_as_tbf(ms->dl_tbf); + case GPRS_RLCMAC_UL_TBF: return ul_tbf_as_tbf(ms->ul_tbf); } return NULL; @@ -1041,9 +1041,9 @@ ms_start_llc_timer(ms); dl_tbf = ms_dl_tbf(ms); - if (dl_tbf && tbf_state((const struct gprs_rlcmac_tbf *)dl_tbf) == TBF_ST_WAIT_RELEASE) { + if (dl_tbf && tbf_state(dl_tbf_as_tbf_const(dl_tbf)) == TBF_ST_WAIT_RELEASE) { LOGPTBFDL(dl_tbf, LOGL_DEBUG, "in WAIT RELEASE state (T3193), so reuse TBF\n"); - tbf_establish_dl_tbf_on_pacch((struct gprs_rlcmac_tbf *)dl_tbf); + tbf_establish_dl_tbf_on_pacch(dl_tbf_as_tbf(dl_tbf)); } return 0; diff --git a/src/pdch_ul_controller.c b/src/pdch_ul_controller.c index 1cdbb98..df0c500 100644 --- a/src/pdch_ul_controller.c +++ b/src/pdch_ul_controller.c @@ -275,7 +275,7 @@ item_tbf = item->tbf_poll.poll_tbf; break; case PDCH_ULC_NODE_TBF_USF: - item_tbf = (struct gprs_rlcmac_tbf *)item->tbf_usf.ul_tbf; + item_tbf = ul_tbf_as_tbf_const(item->tbf_usf.ul_tbf); break; default: OSMO_ASSERT(0); @@ -316,7 +316,7 @@ case PDCH_ULC_NODE_TBF_USF: LOGPDCH(ulc->pdch, DRLCMAC, LOGL_INFO, "Timeout for registered USF (FN=%u): %s\n", - item->fn, tbf_name((struct gprs_rlcmac_tbf *)item->tbf_usf.ul_tbf)); + item->fn, tbf_name(ul_tbf_as_tbf_const(item->tbf_usf.ul_tbf))); tbf_usf_timeout(item->tbf_usf.ul_tbf); break; case PDCH_ULC_NODE_TBF_POLL: diff --git a/src/tbf_ul_ass_fsm.c b/src/tbf_ul_ass_fsm.c index ee5f681..932a91f 100644 --- a/src/tbf_ul_ass_fsm.c +++ b/src/tbf_ul_ass_fsm.c @@ -106,9 +106,9 @@ }; bitvec_unhex(&bv, DUMMY_VEC); - if (ctx->tbf != (struct gprs_rlcmac_tbf *)new_tbf) + if (ctx->tbf != ul_tbf_as_tbf_const(new_tbf)) LOGPTBF(ctx->tbf, LOGL_INFO, "start Packet Uplink Assignment (PACCH) for %s\n", - tbf_name((const struct gprs_rlcmac_tbf *)new_tbf)); + tbf_name(ul_tbf_as_tbf_const(new_tbf))); else LOGPTBF(ctx->tbf, LOGL_INFO, "start Packet Uplink Assignment (PACCH)\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29900 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I223d9d5823c90ff31089420d35a7bf0fe1ebf870 Gerrit-Change-Number: 29900 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-pcu[master]: pdch: Use helper function tbf_as_ul_tbf()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29902 ) Change subject: pdch: Use helper function tbf_as_ul_tbf() ...................................................................... pdch: Use helper function tbf_as_ul_tbf() Change-Id: Ie2a0af7928578823e944b85781ce284722547661 --- M src/pdch.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, approved diff --git a/src/pdch.cpp b/src/pdch.cpp index 4d6d8f6..369406f 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -701,7 +701,7 @@ /* let common path expire the poll */ goto return_unref; } - ul_tbf = (struct gprs_rlcmac_ul_tbf *)item->tbf_poll.poll_tbf; + ul_tbf = tbf_as_ul_tbf(item->tbf_poll.poll_tbf); if (item->tbf_poll.reason != PDCH_ULC_POLL_UL_ACK) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "FN=%u PKT RESOURCE REQ: " "Unexpectedly received, waiting for poll reason %d\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29902 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ie2a0af7928578823e944b85781ce284722547661 Gerrit-Change-Number: 29902 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

Change in osmo-pcu[master]: Rename as_{dl,ul}_tbf -> tbf_as_{dl,ul}_tbf

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/29895 ) Change subject: Rename as_{dl,ul}_tbf -> tbf_as_{dl,ul}_tbf ...................................................................... Rename as_{dl,ul}_tbf -> tbf_as_{dl,ul}_tbf Prefix the function accordingly to specify the input object. Change-Id: I225568fe2cb5236817cdd9609354c24c66723606 --- M src/bts.cpp M src/encoding.cpp M src/gprs_ms.c M src/gprs_rlcmac_sched.cpp M src/gprs_rlcmac_ts_alloc.cpp M src/pcu_vty_functions.cpp M src/pdch.cpp M src/tbf.cpp M src/tbf_dl.cpp M src/tbf_dl.h M src/tbf_fsm.c M src/tbf_ul.cpp M src/tbf_ul.h 13 files changed, 37 insertions(+), 37 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/src/bts.cpp b/src/bts.cpp index e72f4c7..ae63a12 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -1234,7 +1234,7 @@ poll->tbf_poll.poll_tbf->direction != GPRS_RLCMAC_UL_TBF) goto no_tbf; - tbf = as_ul_tbf(poll->tbf_poll.poll_tbf); + tbf = tbf_as_ul_tbf(poll->tbf_poll.poll_tbf); /* we need to distinguish TA information provided by L1 * from PH-DATA-IND and PHY-RA-IND so that we can properly * update TA for given TBF diff --git a/src/encoding.cpp b/src/encoding.cpp index 67defec..278da72 100644 --- a/src/encoding.cpp +++ b/src/encoding.cpp @@ -506,9 +506,9 @@ /* 3GPP TS 44.018 §10.5.2.16 IA Rest Octets */ dest->cur_bit = wp; if (downlink) { - OSMO_ASSERT(as_dl_tbf(tbf) != NULL); + OSMO_ASSERT(tbf_as_dl_tbf(tbf) != NULL); - rc = write_ia_rest_downlink(as_dl_tbf(tbf), dest, polling, gsm48_ta_is_valid(ta), fn, alpha, gamma, + rc = write_ia_rest_downlink(tbf_as_dl_tbf(tbf), dest, polling, gsm48_ta_is_valid(ta), fn, alpha, gamma, ta_idx); } else if (((burst_type == GSM_L1_BURST_TYPE_ACCESS_1) || (burst_type == GSM_L1_BURST_TYPE_ACCESS_2))) { SET_L(dest); SET_H(dest); // "LH" @@ -518,8 +518,8 @@ SET_0(dest); // No < Access Technologies Request struct > - if (as_ul_tbf(tbf) != NULL) - rc = write_ia_rest_egprs_uplink_sba(as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); + if (tbf_as_ul_tbf(tbf) != NULL) + rc = write_ia_rest_egprs_uplink_sba(tbf_as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); else rc = write_ia_rest_egprs_uplink_mba(dest, fn, alpha, gamma); } else { @@ -528,8 +528,8 @@ SET_H(dest); SET_H(dest); // "HH" SET_0(dest); SET_0(dest); // "00" < Packet Uplink Assignment > - if (as_ul_tbf(tbf) != NULL) - rc = write_ia_rest_uplink_mba(as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); + if (tbf_as_ul_tbf(tbf) != NULL) + rc = write_ia_rest_uplink_mba(tbf_as_ul_tbf(tbf), dest, usf, alpha, gamma, ta_idx); else rc = write_ia_rest_uplink_sba(dest, fn, alpha, gamma); } diff --git a/src/gprs_ms.c b/src/gprs_ms.c index df1c9be..0ccedb3 100644 --- a/src/gprs_ms.c +++ b/src/gprs_ms.c @@ -344,9 +344,9 @@ void ms_attach_tbf(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf) { if (tbf_direction(tbf) == GPRS_RLCMAC_DL_TBF) - ms_attach_dl_tbf(ms, as_dl_tbf(tbf)); + ms_attach_dl_tbf(ms, tbf_as_dl_tbf(tbf)); else - ms_attach_ul_tbf(ms, as_ul_tbf(tbf)); + ms_attach_ul_tbf(ms, tbf_as_ul_tbf(tbf)); } void ms_detach_tbf(struct GprsMs *ms, struct gprs_rlcmac_tbf *tbf) diff --git a/src/gprs_rlcmac_sched.cpp b/src/gprs_rlcmac_sched.cpp index f5a01e9..20b4f8e 100644 --- a/src/gprs_rlcmac_sched.cpp +++ b/src/gprs_rlcmac_sched.cpp @@ -45,7 +45,7 @@ struct llist_item *pos; llist_for_each_entry(pos, &pdch->trx->ul_tbfs, list) { - ul_tbf = as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry); + ul_tbf = tbf_as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry); OSMO_ASSERT(ul_tbf); /* this trx, this ts */ if (!ul_tbf->is_control_ts(pdch->ts_no)) @@ -63,7 +63,7 @@ states? */ } llist_for_each_entry(pos, &pdch->trx->dl_tbfs, list) { - dl_tbf = as_dl_tbf((struct gprs_rlcmac_tbf *)pos->entry); + dl_tbf = tbf_as_dl_tbf((struct gprs_rlcmac_tbf *)pos->entry); OSMO_ASSERT(dl_tbf); /* this trx, this ts */ if (!dl_tbf->is_control_ts(pdch->ts_no)) @@ -456,8 +456,8 @@ * let's set its USF in the DL msg. This is not really needed, * but it helps understand better the flow when looking at * pcaps. */ - if (poll_tbf->direction == GPRS_RLCMAC_UL_TBF && as_ul_tbf(poll_tbf)->m_usf[ts] != USF_INVALID) - usf_tbf = as_ul_tbf(poll_tbf); + if (poll_tbf->direction == GPRS_RLCMAC_UL_TBF && tbf_as_ul_tbf(poll_tbf)->m_usf[ts] != USF_INVALID) + usf_tbf = tbf_as_ul_tbf(poll_tbf); /* else, search for uplink tbf */ } else if ((usf_tbf = sched_select_uplink(pdch, require_gprs_only))) { LOGPDCH(pdch, DRLCMACSCHED, LOGL_DEBUG, "Received RTS for PDCH: FN=%d " diff --git a/src/gprs_rlcmac_ts_alloc.cpp b/src/gprs_rlcmac_ts_alloc.cpp index 3a60839..b5757a7 100644 --- a/src/gprs_rlcmac_ts_alloc.cpp +++ b/src/gprs_rlcmac_ts_alloc.cpp @@ -400,11 +400,11 @@ /* The allocation will be successful, so the system state and tbf/ms * may be modified from now on. */ if (tbf->direction == GPRS_RLCMAC_UL_TBF) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf); + struct gprs_rlcmac_ul_tbf *ul_tbf = tbf_as_ul_tbf(tbf); LOGPSL(tbf, LOGL_DEBUG, "Assign uplink TS=%d TFI=%d USF=%d\n", ts, tfi, usf); assign_uplink_tbf_usf(pdch, ul_tbf, tfi, usf); } else { - struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); + struct gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(tbf); LOGPSL(tbf, LOGL_DEBUG, "Assign downlink TS=%d TFI=%d\n", ts, tfi); assign_dlink_tbf(pdch, dl_tbf, tfi); } @@ -951,9 +951,9 @@ tbf->first_ts = first_ts; if (tbf->direction == GPRS_RLCMAC_DL_TBF) - assign_dl_tbf_slots(as_dl_tbf(tbf), trx, dl_slots, tfi); + assign_dl_tbf_slots(tbf_as_dl_tbf(tbf), trx, dl_slots, tfi); else - assign_ul_tbf_slots(as_ul_tbf(tbf), trx, ul_slots, tfi, usf); + assign_ul_tbf_slots(tbf_as_ul_tbf(tbf), trx, ul_slots, tfi, usf); bts_do_rate_ctr_inc(bts, CTR_TBF_ALLOC_ALGO_B); diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp index 28ecebf..91f2068 100644 --- a/src/pcu_vty_functions.cpp +++ b/src/pcu_vty_functions.cpp @@ -42,8 +42,8 @@ static void tbf_print_vty_info(struct vty *vty, struct gprs_rlcmac_tbf *tbf) { - gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf); - gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); + gprs_rlcmac_ul_tbf *ul_tbf = tbf_as_ul_tbf(tbf); + gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(tbf); vty_out(vty, "TBF: TFI=%d TLLI=0x%08x (%s) TA=%u DIR=%s IMSI=%s%s", tbf->tfi(), tbf->tlli(), tbf->is_tlli_valid() ? "valid" : "invalid", diff --git a/src/pdch.cpp b/src/pdch.cpp index a5eb080..4d6d8f6 100644 --- a/src/pdch.cpp +++ b/src/pdch.cpp @@ -376,7 +376,7 @@ switch (reason) { case PDCH_ULC_POLL_UL_ACK: - ul_tbf = as_ul_tbf(tbf); + ul_tbf = tbf_as_ul_tbf(tbf); OSMO_ASSERT(ul_tbf); if (!tbf_ul_ack_exp_ctrl_ack(ul_tbf, fn, ts_no)) { LOGPTBF(tbf, LOGL_NOTICE, "FN=%d, TS=%d (curr FN %d): POLL_UL_ACK not expected!\n", @@ -497,7 +497,7 @@ return; } OSMO_ASSERT(poll->tbf_poll.poll_tbf); - tbf = as_dl_tbf(poll->tbf_poll.poll_tbf); + tbf = tbf_as_dl_tbf(poll->tbf_poll.poll_tbf); if (tbf->tfi() != tfi) { LOGPTBFDL(tbf, LOGL_NOTICE, "PACKET DOWNLINK ACK with wrong TFI=%d, ignoring!\n", tfi); @@ -567,7 +567,7 @@ return; } OSMO_ASSERT(poll->tbf_poll.poll_tbf); - tbf = as_dl_tbf(poll->tbf_poll.poll_tbf); + tbf = tbf_as_dl_tbf(poll->tbf_poll.poll_tbf); if (tbf->tfi() != tfi) { LOGPDCH(this, DRLCMAC, LOGL_NOTICE, "EGPRS PACKET DOWNLINK ACK with " "wrong TFI=%d, ignoring!\n", tfi); @@ -1099,12 +1099,12 @@ gprs_rlcmac_ul_tbf *gprs_rlcmac_pdch::ul_tbf_by_tfi(uint8_t tfi) { - return as_ul_tbf(tbf_by_tfi(tfi, GPRS_RLCMAC_UL_TBF)); + return tbf_as_ul_tbf(tbf_by_tfi(tfi, GPRS_RLCMAC_UL_TBF)); } gprs_rlcmac_dl_tbf *gprs_rlcmac_pdch::dl_tbf_by_tfi(uint8_t tfi) { - return as_dl_tbf(tbf_by_tfi(tfi, GPRS_RLCMAC_DL_TBF)); + return tbf_as_dl_tbf(tbf_by_tfi(tfi, GPRS_RLCMAC_DL_TBF)); } /* lookup TBF Entity (by TFI) */ @@ -1159,7 +1159,7 @@ num_tbfs_update(tbf, true); if (tbf->direction == GPRS_RLCMAC_UL_TBF) { - ul_tbf = as_ul_tbf(tbf); + ul_tbf = tbf_as_ul_tbf(tbf); m_assigned_usf |= 1 << ul_tbf->m_usf[ts_no]; } m_assigned_tfi[tbf->direction] |= 1UL << tbf->tfi(); @@ -1188,7 +1188,7 @@ num_tbfs_update(tbf, false); if (tbf->direction == GPRS_RLCMAC_UL_TBF) { - ul_tbf = as_ul_tbf(tbf); + ul_tbf = tbf_as_ul_tbf(tbf); m_assigned_usf &= ~(1 << ul_tbf->m_usf[ts_no]); } m_assigned_tfi[tbf->direction] &= ~(1UL << tbf->tfi()); @@ -1271,7 +1271,7 @@ * PDCH, since they have no TFI assigned (see handle_tbf_reject()). * Get rid of them too: */ llist_for_each_entry_safe(pos, pos2, &pdch->trx->ul_tbfs, list) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry); + struct gprs_rlcmac_ul_tbf *ul_tbf = tbf_as_ul_tbf((struct gprs_rlcmac_tbf *)pos->entry); if (ul_tbf->control_ts == pdch->ts_no) tbf_free(ul_tbf); } diff --git a/src/tbf.cpp b/src/tbf.cpp index 7094d40..4f0162e 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -268,7 +268,7 @@ if (tbf->state_is(TBF_ST_FLOW)) bts_do_rate_ctr_inc(tbf->bts, CTR_TBF_UL_ABORTED); } else { - gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(tbf); + gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(tbf); gprs_rlc_dl_window *win = static_cast<gprs_rlc_dl_window *>(dl_tbf->window()); bts_do_rate_ctr_inc(tbf->bts, CTR_TBF_DL_FREED); @@ -324,7 +324,7 @@ } if (is_egprs_enabled()) { - gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(this); + gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(this); if (dl_tbf) dl_tbf->set_window_size(); } @@ -549,7 +549,7 @@ switch (reason) { case PDCH_ULC_POLL_UL_ACK: - ul_tbf = as_ul_tbf(this); + ul_tbf = tbf_as_ul_tbf(this); OSMO_ASSERT(ul_tbf); if (!tbf_ul_ack_exp_ctrl_ack(ul_tbf, poll_fn, pdch->ts_no)) { LOGPTBF(this, LOGL_NOTICE, "FN=%d, TS=%d (curr FN %d): POLL_UL_ACK not expected!\n", @@ -617,7 +617,7 @@ break; case PDCH_ULC_POLL_DL_ACK: - dl_tbf = as_dl_tbf(this); + dl_tbf = tbf_as_dl_tbf(this); /* POLL Timeout expecting DL ACK/NACK: implies direction == GPRS_RLCMAC_DL_TBF */ OSMO_ASSERT(dl_tbf); if (!(dl_tbf->state_fsm.state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) { @@ -741,7 +741,7 @@ osmo_fsm_inst_update_id(tbf->dl_ass_fsm.fi, buf); if (tbf_direction(tbf) == GPRS_RLCMAC_UL_TBF) { - struct gprs_rlcmac_ul_tbf *ul_tbf = as_ul_tbf(tbf); + struct gprs_rlcmac_ul_tbf *ul_tbf = tbf_as_ul_tbf(tbf); osmo_fsm_inst_update_id(ul_tbf->ul_ack_fsm.fi, buf); } diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index 9fe1bd8..a8fb6fc 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -1318,7 +1318,7 @@ } } -struct gprs_rlcmac_dl_tbf *as_dl_tbf(struct gprs_rlcmac_tbf *tbf) +struct gprs_rlcmac_dl_tbf *tbf_as_dl_tbf(struct gprs_rlcmac_tbf *tbf) { if (tbf && tbf->direction == GPRS_RLCMAC_DL_TBF) return static_cast<gprs_rlcmac_dl_tbf *>(tbf); diff --git a/src/tbf_dl.h b/src/tbf_dl.h index 8160cf3..e0daf57 100644 --- a/src/tbf_dl.h +++ b/src/tbf_dl.h @@ -130,7 +130,7 @@ struct gprs_rlcmac_dl_tbf *dl_tbf_alloc(struct gprs_rlcmac_bts *bts, struct GprsMs *ms, int8_t use_trx, bool single_slot); -struct gprs_rlcmac_dl_tbf *as_dl_tbf(struct gprs_rlcmac_tbf *tbf); +struct gprs_rlcmac_dl_tbf *tbf_as_dl_tbf(struct gprs_rlcmac_tbf *tbf); /* dispatch Unitdata.DL messages */ int dl_tbf_handle(struct gprs_rlcmac_bts *bts, const uint32_t tlli, const uint32_t old_tlli, diff --git a/src/tbf_fsm.c b/src/tbf_fsm.c index 2189747..2b712e7 100644 --- a/src/tbf_fsm.c +++ b/src/tbf_fsm.c @@ -342,7 +342,7 @@ static void handle_timeout_X2002(struct tbf_fsm_ctx *ctx) { - struct gprs_rlcmac_dl_tbf *dl_tbf = as_dl_tbf(ctx->tbf); + struct gprs_rlcmac_dl_tbf *dl_tbf = tbf_as_dl_tbf(ctx->tbf); /* X2002 is used only for DL TBF */ OSMO_ASSERT(dl_tbf); diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 21a7a76..3988176 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -758,7 +758,7 @@ osmo_fsm_inst_dispatch(this->state_fsm.fi, TBF_EV_MAX_N3101, NULL); } -struct gprs_rlcmac_ul_tbf *as_ul_tbf(struct gprs_rlcmac_tbf *tbf) +struct gprs_rlcmac_ul_tbf *tbf_as_ul_tbf(struct gprs_rlcmac_tbf *tbf) { if (tbf && tbf->direction == GPRS_RLCMAC_UL_TBF) return static_cast<gprs_rlcmac_ul_tbf *>(tbf); diff --git a/src/tbf_ul.h b/src/tbf_ul.h index d69220d..301c52a 100644 --- a/src/tbf_ul.h +++ b/src/tbf_ul.h @@ -137,7 +137,7 @@ #endif void update_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, int8_t ta_delta); void set_tbf_ta(struct gprs_rlcmac_ul_tbf *tbf, uint8_t ta); -struct gprs_rlcmac_ul_tbf *as_ul_tbf(struct gprs_rlcmac_tbf *tbf); +struct gprs_rlcmac_ul_tbf *tbf_as_ul_tbf(struct gprs_rlcmac_tbf *tbf); void tbf_usf_timeout(struct gprs_rlcmac_ul_tbf *tbf); bool ul_tbf_contention_resolution_done(const struct gprs_rlcmac_ul_tbf *tbf); struct osmo_fsm_inst *tbf_ul_ack_fi(const struct gprs_rlcmac_ul_tbf *tbf); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/29895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I225568fe2cb5236817cdd9609354c24c66723606 Gerrit-Change-Number: 29895 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022