- gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()
by laforge 01 Apr '22

01 Apr '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27620/comment/699a1503_1cb9c4d9 PS1, Line 1224: if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { > abis_rsl_rcvmsg() is checking for 'sizeof(struct abis_rsl_common_hdr)' length. […] https://gerrit.osmocom.org/c/osmo-bsc/+/27624 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:47:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: abis_rsl: Ensure message length is sufficient for respective header
by laforge 01 Apr '22

01 Apr '22

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27624 ) Change subject: abis_rsl: Ensure message length is sufficient for respective header ...................................................................... abis_rsl: Ensure message length is sufficient for respective header Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/27624/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6681875..822d39a 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -1502,6 +1502,9 @@ int rc = 0; struct e1inp_sign_link *sign_link = msg->dst; + if (msgb_l2len(msg) < sizeof(*rslh)) + return -EINVAL; + if (rslh->ie_chan != RSL_IE_CHAN_NR) { LOGP(DRSL, LOGL_ERROR, "Rx RSL DCHAN: invalid RSL header, expecting Channel Number IE tag, got 0x%x\n", @@ -1602,6 +1605,9 @@ struct tlv_parsed tp; struct e1inp_sign_link *sign_link = msg->dst; + if (msgb_l2len(msg) < sizeof(*rslh)) + return -EINVAL; + rsl_tlv_parse(&tp, rslh->data, msgb_l2len(msg)-sizeof(*rslh)); LOGP(DRSL, LOGL_ERROR, "%s ERROR REPORT%s\n", @@ -2403,6 +2409,9 @@ struct rate_ctr_group *bts_ctrs = sign_link->trx->bts->bts_ctrs; int rc = 0; + if (msgb_l2len(msg) < sizeof(*rslh)) + return -EINVAL; + msg->lchan = lchan_lookup(sign_link->trx, rslh->chan_nr, "Abis RSL rx CCHAN: "); @@ -2472,8 +2481,12 @@ struct e1inp_sign_link *sign_link = msg->dst; struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); int rc = 0; - uint8_t sapi = rllh->link_id & 0x7; + uint8_t sapi; + if (msgb_l2len(msg) < sizeof(*rllh)) + return -1; + + sapi = rllh->link_id & 0x7; msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx RLL: "); switch (rllh->c.msg_type) { @@ -2895,6 +2908,9 @@ struct abis_rsl_rll_hdr *rllh = msgb_l2(msg); int rc = 0; + if (msgb_l2len(msg) < sizeof(*rllh)) + return -EINVAL; + msg->lchan = lchan_lookup(sign_link->trx, rllh->chan_nr, "Abis RSL rx IPACC: "); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27624 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I63b64f1f241de3a76f9b66ed2cf524cc88933062 Gerrit-Change-Number: 27624 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()
by pespin 01 Apr '22

01 Apr '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:43:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-pcu[master]: llc: Convert to C
by pespin 01 Apr '22

01 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27623 ) Change subject: llc: Convert to C ...................................................................... llc: Convert to C There's no real reason (other than historical) why code in llc should be kept as c++ code. Let's rewrite it as C so that it can be included by existing C code without having to add C->C++ shim, ifdefs all around, etc. This simplifies code and easies modification/improvement of the related objects. Change-Id: I250680ba581167d7398b2f734769c756cbb61c48 --- M debian/copyright M src/Makefile.am R src/llc.c M src/llc.h M src/tbf.cpp M src/tbf_dl.cpp M src/tbf_ul.cpp M tests/edge/EdgeTest.cpp M tests/llc/LlcTest.cpp M tests/types/TypesTest.cpp 10 files changed, 131 insertions(+), 143 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/23/27623/1 diff --git a/debian/copyright b/debian/copyright index 4e9347e..4a2b5dd 100644 --- a/debian/copyright +++ b/debian/copyright @@ -42,7 +42,7 @@ src/tbf_dl.cpp src/sba.cpp src/sba.h - src/llc.cpp + src/llc.c src/encoding.cpp src/encoding.h src/gprs_rlcmac.cpp @@ -50,6 +50,7 @@ Copyright: 2012 Ivan Klyuchnikov 2012 Andreas Eversberg <jolly(a)eversberg.eu> 2013 by Holger Hans Peter Freyther + 2022 by by Sysmocom s.f.m.c. GmbH License: GPL-2.0+ Files: src/gprs_rlcmac.h diff --git a/src/Makefile.am b/src/Makefile.am index 25fdab2..fedc96f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,7 +73,7 @@ encoding.cpp \ sba.c \ decoding.cpp \ - llc.cpp \ + llc.c \ rlc.cpp \ osmobts_sock.c \ gprs_codel.c \ diff --git a/src/llc.cpp b/src/llc.c similarity index 69% rename from src/llc.cpp rename to src/llc.c index 5cf2213..700585a 100644 --- a/src/llc.cpp +++ b/src/llc.c @@ -15,32 +15,36 @@ * GNU General Public License for more details. */ -#include <bts.h> #include <stdio.h> -extern "C" { #include <osmocom/core/msgb.h> -} +#include "bts.h" #include "pcu_utils.h" +#include "llc.h" + +void llc_init(struct gprs_llc *llc) +{ + llc_reset(llc); +} /* reset LLC frame */ -void gprs_llc::reset() +void llc_reset(struct gprs_llc *llc) { - index = 0; - length = 0; + llc->index = 0; + llc->length = 0; - memset(frame, 0x42, sizeof(frame)); + memset(llc->frame, 0x42, sizeof(llc->frame)); } -void gprs_llc::reset_frame_space() +void llc_reset_frame_space(struct gprs_llc *llc) { - index = 0; + llc->index = 0; } /* Put an Unconfirmed Information (UI) Dummy command, see GSM 44.064, 6.4.2.2 */ -void gprs_llc::put_dummy_frame(size_t req_len) +void llc_put_dummy_frame(struct gprs_llc *llc, size_t req_len) { /* The shortest dummy command (the spec requests at least 6 octets) */ static const uint8_t llc_dummy_command[] = { @@ -48,39 +52,34 @@ }; static const size_t max_dummy_command_len = 79; - put_frame(llc_dummy_command, sizeof(llc_dummy_command)); + llc_put_frame(llc, llc_dummy_command, sizeof(llc_dummy_command)); if (req_len > max_dummy_command_len) req_len = max_dummy_command_len; /* Add further stuffing, if the requested length exceeds the minimum * dummy command length */ - if (length < req_len) { - memset(&frame[length], 0x2b, req_len - length); - length = req_len; + if (llc->length < req_len) { + memset(&llc->frame[llc->length], 0x2b, req_len - llc->length); + llc->length = req_len; } } -void gprs_llc::put_frame(const uint8_t *data, size_t len) +void llc_put_frame(struct gprs_llc *llc, const uint8_t *data, size_t len) { /* only put frames when we are empty */ - OSMO_ASSERT(index == 0 && length == 0); - append_frame(data, len); + OSMO_ASSERT(llc->index == 0 && llc->length == 0); + llc_append_frame(llc, data, len); } -void gprs_llc::append_frame(const uint8_t *data, size_t len) +void llc_append_frame(struct gprs_llc *llc, const uint8_t *data, size_t len) { /* TODO: bounds check */ - memcpy(frame + length, data, len); - length += len; + memcpy(llc->frame + llc->length, data, len); + llc->length += len; } -void gprs_llc::init() -{ - reset(); -} - -bool gprs_llc::is_user_data_frame(uint8_t *data, size_t len) +bool llc_is_user_data_frame(const uint8_t *data, size_t len) { if (len < 2) return false; @@ -104,20 +103,20 @@ } -void gprs_llc_queue::enqueue(struct msgb *llc_msg, const struct timespec *expire_time) +void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time) { - MetaInfo *meta_storage; + struct MetaInfo *meta_storage; osmo_static_assert(sizeof(*meta_storage) <= sizeof(llc_msg->cb), info_does_not_fit); - queue_size += 1; - queue_octets += msgb_length(llc_msg); + q->queue_size += 1; + q->queue_octets += msgb_length(llc_msg); - meta_storage = (MetaInfo *)&llc_msg->cb[0]; + meta_storage = (struct MetaInfo *)&llc_msg->cb[0]; osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time); meta_storage->expire_time = *expire_time; - msgb_enqueue(&queue, llc_msg); + msgb_enqueue(&q->queue, llc_msg); } void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts) @@ -159,8 +158,8 @@ msg = msg1; msg1 = NULL; } else { - const MetaInfo *mi1 = (MetaInfo *)&msg1->cb[0]; - const MetaInfo *mi2 = (MetaInfo *)&msg2->cb[0]; + const struct MetaInfo *mi1 = (struct MetaInfo *)&msg1->cb[0]; + const struct MetaInfo *mi2 = (struct MetaInfo *)&msg2->cb[0]; if (timespeccmp(&mi2->recv_time, &mi1->recv_time, >)) { msg = msg1; @@ -189,24 +188,24 @@ #define ALPHA 0.5f -struct msgb *gprs_llc_queue::dequeue(const MetaInfo **info) +struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q, const struct MetaInfo **info) { struct msgb *msg; struct timespec *tv, tv_now, tv_result; uint32_t lifetime; - const MetaInfo *meta_storage; + const struct MetaInfo *meta_storage; - msg = msgb_dequeue(&queue); + msg = msgb_dequeue(&q->queue); if (!msg) return NULL; - meta_storage = (MetaInfo *)&msg->cb[0]; + meta_storage = (struct MetaInfo *)&msg->cb[0]; if (info) *info = meta_storage; - queue_size -= 1; - queue_octets -= msgb_length(msg); + q->queue_size -= 1; + q->queue_octets -= msgb_length(msg); /* take the second time */ osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); @@ -214,12 +213,12 @@ timespecsub(&tv_now, &meta_storage->recv_time, &tv_result); lifetime = tv_result.tv_sec*1000 + tv_result.tv_nsec/1000000; - avg_queue_delay = avg_queue_delay * ALPHA + lifetime * (1-ALPHA); + q->avg_queue_delay = q->avg_queue_delay * ALPHA + lifetime * (1-ALPHA); return msg; } -void gprs_llc_queue::calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, struct timespec *tv) +void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, struct timespec *tv) { uint16_t delay_csec; if (bts->pcu->vty.force_llc_lifetime) @@ -241,8 +240,7 @@ timespecadd(&now, &csec, tv); } -bool gprs_llc_queue::is_frame_expired(const struct timespec *tv_now, - const struct timespec *tv) +bool llc_queue_is_frame_expired(const struct timespec *tv_now, const struct timespec *tv) { /* Timeout is infinite */ if (tv->tv_sec == 0 && tv->tv_nsec == 0) diff --git a/src/llc.h b/src/llc.h index e7548d4..a371b68 100644 --- a/src/llc.h +++ b/src/llc.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2013 by Holger Hans Peter Freyther + * Copyright (C) 2022 by by Sysmocom s.f.m.c. GmbH * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,15 +18,14 @@ #ifdef __cplusplus extern "C" { #endif - #include <osmocom/core/linuxlist.h> -#ifdef __cplusplus -} -#endif #include <stdint.h> #include <string.h> #include <time.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/msgb.h> + #define LLC_MAX_LEN 1543 struct gprs_rlcmac_bts; @@ -34,23 +34,19 @@ * I represent the LLC data to a MS */ struct gprs_llc { - -#ifdef __cplusplus - static bool is_user_data_frame(uint8_t *data, size_t len); - - void init(); - void reset(); - void reset_frame_space(); - - void put_frame(const uint8_t *data, size_t len); - void put_dummy_frame(size_t req_len); - void append_frame(const uint8_t *data, size_t len); -#endif - uint8_t frame[LLC_MAX_LEN]; /* current DL or UL frame */ uint16_t index; /* current write/read position of frame */ uint16_t length; /* len of current DL LLC_frame, 0 == no frame */ }; +bool llc_is_user_data_frame(const uint8_t *data, size_t len); + +void llc_init(struct gprs_llc *llc); +void llc_reset(struct gprs_llc *llc); +void llc_reset_frame_space(struct gprs_llc *llc); + +void llc_put_frame(struct gprs_llc *llc, const uint8_t *data, size_t len); +void llc_put_dummy_frame(struct gprs_llc *llc, size_t req_len); +void llc_append_frame(struct gprs_llc *llc, const uint8_t *data, size_t len); struct MetaInfo { struct timespec recv_time; @@ -60,28 +56,21 @@ * I store the LLC frames that come from the SGSN. */ struct gprs_llc_queue { -#ifdef __cplusplus - static void calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, - struct timespec *tv); - static bool is_frame_expired(const struct timespec *now, - const struct timespec *tv); - static bool is_user_data_frame(uint8_t *data, size_t len); - - void enqueue(struct msgb *llc_msg, const struct timespec *expire_time); - struct msgb *dequeue(const MetaInfo **info = 0); -#endif uint32_t avg_queue_delay; /* Average delay of data going through the queue */ size_t queue_size; size_t queue_octets; struct llist_head queue; /* queued LLC DL data */ }; -#ifdef __cplusplus -extern "C" { -#endif +void llc_queue_calc_pdu_lifetime(struct gprs_rlcmac_bts *bts, const uint16_t pdu_delay_csec, + struct timespec *tv); +bool llc_queue_is_frame_expired(const struct timespec *tv_now, const struct timespec *tv); + void llc_queue_init(struct gprs_llc_queue *q); void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts); void llc_queue_move_and_merge(struct gprs_llc_queue *q, struct gprs_llc_queue *o); +void llc_queue_enqueue(struct gprs_llc_queue *q, struct msgb *llc_msg, const struct timespec *expire_time); +struct msgb *llc_queue_dequeue(struct gprs_llc_queue *q, const struct MetaInfo **info); static inline uint16_t llc_chunk_size(const struct gprs_llc *llc) { diff --git a/src/tbf.cpp b/src/tbf.cpp index c2eeb89..2c68ede 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -130,7 +130,7 @@ OSMO_ASSERT(dl_ass_fsm.fi); m_rlc.init(); - m_llc.init(); + llc_init(&m_llc); m_name_buf[0] = '\0'; diff --git a/src/tbf_dl.cpp b/src/tbf_dl.cpp index ec455c1..01b8f68 100644 --- a/src/tbf_dl.cpp +++ b/src/tbf_dl.cpp @@ -217,9 +217,9 @@ if (!llc_msg) return -ENOMEM; - gprs_llc_queue::calc_pdu_lifetime(bts, pdu_delay_csec, &expire_time); + llc_queue_calc_pdu_lifetime(bts, pdu_delay_csec, &expire_time); memcpy(msgb_put(llc_msg, len), data, len); - llc_queue()->enqueue(llc_msg, &expire_time); + llc_queue_enqueue(llc_queue(), llc_msg, &expire_time); start_llc_timer(); if (state_is(TBF_ST_WAIT_RELEASE)) { @@ -358,7 +358,7 @@ osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); timespecadd(&tv_now, &hyst_delta, &tv_now2); - while ((msg = llc_queue()->dequeue(&info))) { + while ((msg = llc_queue_dequeue(llc_queue(), &info))) { const struct timespec *tv_disc = &info->expire_time; const struct timespec *tv_recv = &info->recv_time; @@ -372,11 +372,11 @@ } /* Is the age below the low water mark? */ - if (!gprs_llc_queue::is_frame_expired(&tv_now2, tv_disc)) + if (!llc_queue_is_frame_expired(&tv_now2, tv_disc)) break; /* Is the age below the high water mark */ - if (!gprs_llc_queue::is_frame_expired(&tv_now, tv_disc)) { + if (!llc_queue_is_frame_expired(&tv_now, tv_disc)) { /* Has the previous message not been dropped? */ if (frames == 0) break; @@ -391,7 +391,7 @@ break; /* Is it a GMM message? */ - if (!gprs_llc::is_user_data_frame(msg->data, msg->len)) + if (!llc_is_user_data_frame(msg->data, msg->len)) break; } @@ -634,7 +634,7 @@ LOGPTBFDL(this, LOGL_DEBUG, "Dequeue next LLC (len=%d)\n", msg->len); - m_llc.put_frame(msg->data, msg->len); + llc_put_frame(&m_llc, msg->data, msg->len); bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_SCHED); msgb_free(msg); m_last_dl_drained_fn = -1; @@ -726,7 +726,7 @@ * "Delayed release of downlink Temporary Block Flow" */ /* A header will need to by added, so we just need * space-1 octets */ - m_llc.put_dummy_frame(space - 1); + llc_put_dummy_frame(&m_llc, space - 1); LOGPTBFDL(this, LOGL_DEBUG, "Empty chunk, added LLC dummy command of size %d, drained_since=%d\n", @@ -747,7 +747,7 @@ LOGPTBFDL(this, LOGL_DEBUG, "Complete DL frame, len=%d\n", llc_frame_length(&m_llc)); gprs_rlcmac_dl_bw(this, llc_frame_length(&m_llc)); bts_do_rate_ctr_add(bts, CTR_LLC_DL_BYTES, llc_frame_length(&m_llc)); - m_llc.reset(); + llc_reset(&m_llc); if (is_final) { request_dl_ack(); diff --git a/src/tbf_ul.cpp b/src/tbf_ul.cpp index 305daaa..21a7a76 100644 --- a/src/tbf_ul.cpp +++ b/src/tbf_ul.cpp @@ -283,7 +283,7 @@ i + 1, frame->offset, frame->length, frame->is_complete); - m_llc.append_frame(data + frame->offset, frame->length); + llc_append_frame(&m_llc, data + frame->offset, frame->length); llc_consume(&m_llc, frame->length); } @@ -292,7 +292,7 @@ LOGPTBFUL(this, LOGL_DEBUG, "complete UL frame len=%d\n", llc_frame_length(&m_llc)); snd_ul_ud(); bts_do_rate_ctr_add(bts, CTR_LLC_UL_BYTES, llc_frame_length(&m_llc)); - m_llc.reset(); + llc_reset(&m_llc); } } @@ -544,7 +544,7 @@ LOGP(DBSSGP, LOGL_INFO, "LLC [PCU -> SGSN] %s len=%d\n", tbf_name(this), llc_frame_length(&m_llc)); if (!bctx) { LOGP(DBSSGP, LOGL_ERROR, "No bctx\n"); - m_llc.reset_frame_space(); + llc_reset_frame_space(&m_llc); return -EIO; } @@ -556,7 +556,7 @@ qos_profile[2] = QOS_PROFILE; bssgp_tx_ul_ud(bctx, tlli(), qos_profile, llc_pdu); - m_llc.reset_frame_space(); + llc_reset_frame_space(&m_llc); return 0; } diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 134e856..02a3568 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -535,7 +535,7 @@ printf("=== start %s ===\n", __func__); - llc.init(); + llc_init(&llc); /* TS 44.060, B.1 */ cs = CS4; @@ -544,8 +544,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 11); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 11); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -557,8 +557,8 @@ OSMO_ASSERT(count_payload == 11); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 26); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 26); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -570,8 +570,8 @@ OSMO_ASSERT(count_payload == 26); OSMO_ASSERT(num_chunks == 2); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -597,8 +597,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 20); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 20); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -632,8 +632,8 @@ OSMO_ASSERT(count_payload == 1); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -657,8 +657,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 7); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 7); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -670,8 +670,8 @@ OSMO_ASSERT(count_payload == 7); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 11); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 11); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -696,8 +696,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -721,8 +721,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 20); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 20); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -746,8 +746,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 30); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 30); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -779,8 +779,8 @@ OSMO_ASSERT(count_payload == 10); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -804,8 +804,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 11); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 11); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -817,8 +817,8 @@ OSMO_ASSERT(count_payload == 11); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 26); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 26); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -830,8 +830,8 @@ OSMO_ASSERT(count_payload == 26); OSMO_ASSERT(num_chunks == 2); - llc.reset(); - llc.put_frame(llc_data, 99); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 99); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -862,8 +862,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 15); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 15); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -875,8 +875,8 @@ OSMO_ASSERT(count_payload == 15); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 12); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 12); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -911,8 +911,8 @@ OSMO_ASSERT(count_payload == 0); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 7); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 7); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -925,8 +925,8 @@ OSMO_ASSERT(count_payload == 7); OSMO_ASSERT(num_chunks == 2); - llc.reset(); - llc.put_frame(llc_data, 18); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 18); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -950,8 +950,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, 6); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 6); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -963,8 +963,8 @@ OSMO_ASSERT(count_payload == 6); OSMO_ASSERT(num_chunks == 1); - llc.reset(); - llc.put_frame(llc_data, 12); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, 12); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -994,8 +994,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, rdbi.data_len); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, rdbi.data_len); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -1020,8 +1020,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, rdbi.data_len - 1); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, rdbi.data_len - 1); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, @@ -1048,8 +1048,8 @@ write_offset = 0; memset(data, 0, sizeof(data)); - llc.reset(); - llc.put_frame(llc_data, rdbi.data_len - 2); + llc_reset(&llc); + llc_put_frame(&llc, llc_data, rdbi.data_len - 2); count_payload = -1; ar = Encoding::rlc_data_to_dl_append(&rdbi, cs, diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp index d98636a..b18f6de 100644 --- a/tests/llc/LlcTest.cpp +++ b/tests/llc/LlcTest.cpp @@ -56,7 +56,7 @@ memcpy(msg_data, data, len); - queue->enqueue(llc_msg, expire_time); + llc_queue_enqueue(queue, llc_msg, expire_time); } static void dequeue_and_check(gprs_llc_queue *queue, const uint8_t *exp_data, @@ -65,7 +65,7 @@ struct msgb *llc_msg; const MetaInfo *info_res; - llc_msg = queue->dequeue(&info_res); + llc_msg = llc_queue_dequeue(queue, &info_res); OSMO_ASSERT(llc_msg != NULL); fprintf(stderr, "dequeued msg, length %u (expected %zu), data %s\n", diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp index 3834acb..c497d07 100644 --- a/tests/types/TypesTest.cpp +++ b/tests/types/TypesTest.cpp @@ -58,20 +58,20 @@ uint8_t data[LLC_MAX_LEN] = {1, 2, 3, 4, }; uint8_t out; gprs_llc llc; - llc.init(); + llc_init(&llc); OSMO_ASSERT(llc_chunk_size(&llc) == 0); OSMO_ASSERT(llc_remaining_space(&llc) == LLC_MAX_LEN); OSMO_ASSERT(llc_frame_length(&llc) == 0); - llc.put_frame(data, 2); + llc_put_frame(&llc, data, 2); OSMO_ASSERT(llc_remaining_space(&llc) == LLC_MAX_LEN - 2); OSMO_ASSERT(llc_frame_length(&llc) == 2); OSMO_ASSERT(llc_chunk_size(&llc) == 2); OSMO_ASSERT(llc.frame[0] == 1); OSMO_ASSERT(llc.frame[1] == 2); - llc.append_frame(&data[3], 1); + llc_append_frame(&llc, &data[3], 1); OSMO_ASSERT(llc_remaining_space(&llc) == LLC_MAX_LEN - 3); OSMO_ASSERT(llc_frame_length(&llc) == 3); OSMO_ASSERT(llc_chunk_size(&llc) == 3); @@ -88,7 +88,7 @@ OSMO_ASSERT(llc.frame[2] == 4); /* now fill the frame */ - llc.append_frame(data, llc_remaining_space(&llc) - 1); + llc_append_frame(&llc, data, llc_remaining_space(&llc) - 1); OSMO_ASSERT(llc_fits_in_current_frame(&llc, 1)); OSMO_ASSERT(!llc_fits_in_current_frame(&llc, 2)); } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27623 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I250680ba581167d7398b2f734769c756cbb61c48 Gerrit-Change-Number: 27623 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-pcu[master]: llc: Convert to C: s/m_//g
by pespin 01 Apr '22

01 Apr '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/27622 ) Change subject: llc: Convert to C: s/m_//g ...................................................................... llc: Convert to C: s/m_//g Change-Id: Ia5272841392110b87725e87a7e6824c17a70d6d1 --- M src/llc.cpp M src/llc.h M tests/tbf/TbfTest.cpp 3 files changed, 47 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/22/27622/1 diff --git a/src/llc.cpp b/src/llc.cpp index b118307..5cf2213 100644 --- a/src/llc.cpp +++ b/src/llc.cpp @@ -28,15 +28,15 @@ /* reset LLC frame */ void gprs_llc::reset() { - m_index = 0; - m_length = 0; + index = 0; + length = 0; memset(frame, 0x42, sizeof(frame)); } void gprs_llc::reset_frame_space() { - m_index = 0; + index = 0; } /* Put an Unconfirmed Information (UI) Dummy command, see GSM 44.064, 6.4.2.2 */ @@ -55,24 +55,24 @@ /* Add further stuffing, if the requested length exceeds the minimum * dummy command length */ - if (m_length < req_len) { - memset(&frame[m_length], 0x2b, req_len - m_length); - m_length = req_len; + if (length < req_len) { + memset(&frame[length], 0x2b, req_len - length); + length = req_len; } } void gprs_llc::put_frame(const uint8_t *data, size_t len) { /* only put frames when we are empty */ - OSMO_ASSERT(m_index == 0 && m_length == 0); + OSMO_ASSERT(index == 0 && length == 0); append_frame(data, len); } void gprs_llc::append_frame(const uint8_t *data, size_t len) { /* TODO: bounds check */ - memcpy(frame + m_length, data, len); - m_length += len; + memcpy(frame + length, data, len); + length += len; } void gprs_llc::init() @@ -97,10 +97,10 @@ void llc_queue_init(struct gprs_llc_queue *q) { - INIT_LLIST_HEAD(&q->m_queue); - q->m_queue_size = 0; - q->m_queue_octets = 0; - q->m_avg_queue_delay = 0; + INIT_LLIST_HEAD(&q->queue); + q->queue_size = 0; + q->queue_octets = 0; + q->avg_queue_delay = 0; } @@ -110,28 +110,28 @@ osmo_static_assert(sizeof(*meta_storage) <= sizeof(llc_msg->cb), info_does_not_fit); - m_queue_size += 1; - m_queue_octets += msgb_length(llc_msg); + queue_size += 1; + queue_octets += msgb_length(llc_msg); meta_storage = (MetaInfo *)&llc_msg->cb[0]; osmo_clock_gettime(CLOCK_MONOTONIC, &meta_storage->recv_time); meta_storage->expire_time = *expire_time; - msgb_enqueue(&m_queue, llc_msg); + msgb_enqueue(&queue, llc_msg); } void llc_queue_clear(struct gprs_llc_queue *q, struct gprs_rlcmac_bts *bts) { struct msgb *msg; - while ((msg = msgb_dequeue(&q->m_queue))) { + while ((msg = msgb_dequeue(&q->queue))) { if (bts) bts_do_rate_ctr_inc(bts, CTR_LLC_FRAME_DROPPED); msgb_free(msg); } - q->m_queue_size = 0; - q->m_queue_octets = 0; + q->queue_size = 0; + q->queue_octets = 0; } void llc_queue_move_and_merge(struct gprs_llc_queue *q, struct gprs_llc_queue *o) @@ -144,10 +144,10 @@ while (1) { if (msg1 == NULL) - msg1 = msgb_dequeue(&q->m_queue); + msg1 = msgb_dequeue(&q->queue); if (msg2 == NULL) - msg2 = msgb_dequeue(&o->m_queue); + msg2 = msgb_dequeue(&o->queue); if (msg1 == NULL && msg2 == NULL) break; @@ -176,15 +176,15 @@ queue_octets += msgb_length(msg); } - OSMO_ASSERT(llist_empty(&q->m_queue)); - OSMO_ASSERT(llist_empty(&o->m_queue)); + OSMO_ASSERT(llist_empty(&q->queue)); + OSMO_ASSERT(llist_empty(&o->queue)); - o->m_queue_size = 0; - o->m_queue_octets = 0; + o->queue_size = 0; + o->queue_octets = 0; - llist_splice_init(&new_queue, &q->m_queue); - q->m_queue_size = queue_size; - q->m_queue_octets = queue_octets; + llist_splice_init(&new_queue, &q->queue); + q->queue_size = queue_size; + q->queue_octets = queue_octets; } #define ALPHA 0.5f @@ -196,7 +196,7 @@ uint32_t lifetime; const MetaInfo *meta_storage; - msg = msgb_dequeue(&m_queue); + msg = msgb_dequeue(&queue); if (!msg) return NULL; @@ -205,8 +205,8 @@ if (info) *info = meta_storage; - m_queue_size -= 1; - m_queue_octets -= msgb_length(msg); + queue_size -= 1; + queue_octets -= msgb_length(msg); /* take the second time */ osmo_clock_gettime(CLOCK_MONOTONIC, &tv_now); @@ -214,7 +214,7 @@ timespecsub(&tv_now, &meta_storage->recv_time, &tv_result); lifetime = tv_result.tv_sec*1000 + tv_result.tv_nsec/1000000; - m_avg_queue_delay = m_avg_queue_delay * ALPHA + lifetime * (1-ALPHA); + avg_queue_delay = avg_queue_delay * ALPHA + lifetime * (1-ALPHA); return msg; } diff --git a/src/llc.h b/src/llc.h index 623ae49..e7548d4 100644 --- a/src/llc.h +++ b/src/llc.h @@ -48,8 +48,8 @@ #endif uint8_t frame[LLC_MAX_LEN]; /* current DL or UL frame */ - uint16_t m_index; /* current write/read position of frame */ - uint16_t m_length; /* len of current DL LLC_frame, 0 == no frame */ + uint16_t index; /* current write/read position of frame */ + uint16_t length; /* len of current DL LLC_frame, 0 == no frame */ }; struct MetaInfo { @@ -70,10 +70,10 @@ void enqueue(struct msgb *llc_msg, const struct timespec *expire_time); struct msgb *dequeue(const MetaInfo **info = 0); #endif - uint32_t m_avg_queue_delay; /* Average delay of data going through the queue */ - size_t m_queue_size; - size_t m_queue_octets; - struct llist_head m_queue; /* queued LLC DL data */ + uint32_t avg_queue_delay; /* Average delay of data going through the queue */ + size_t queue_size; + size_t queue_octets; + struct llist_head queue; /* queued LLC DL data */ }; #ifdef __cplusplus @@ -85,44 +85,44 @@ static inline uint16_t llc_chunk_size(const struct gprs_llc *llc) { - return llc->m_length - llc->m_index; + return llc->length - llc->index; } static inline uint16_t llc_remaining_space(const struct gprs_llc *llc) { - return LLC_MAX_LEN - llc->m_length; + return LLC_MAX_LEN - llc->length; } static inline uint16_t llc_frame_length(const struct gprs_llc *llc) { - return llc->m_length; + return llc->length; } static inline void llc_consume(struct gprs_llc *llc, size_t len) { - llc->m_index += len; + llc->index += len; } static inline void llc_consume_data(struct gprs_llc *llc, uint8_t *data, size_t len) { /* copy and increment index */ - memcpy(data, llc->frame + llc->m_index, len); + memcpy(data, llc->frame + llc->index, len); llc_consume(llc, len); } static inline bool llc_fits_in_current_frame(const struct gprs_llc *llc, uint8_t chunk_size) { - return llc->m_length + chunk_size <= LLC_MAX_LEN; + return llc->length + chunk_size <= LLC_MAX_LEN; } static inline size_t llc_queue_size(const struct gprs_llc_queue *q) { - return q->m_queue_size; + return q->queue_size; } static inline size_t llc_queue_octets(const struct gprs_llc_queue *q) { - return q->m_queue_octets; + return q->queue_octets; } #ifdef __cplusplus diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 9bea528..d077852 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -2528,7 +2528,7 @@ data_msg[5] = 0x0; pdch->rcv_block(data_msg, 49, *fn, &meas); - OSMO_ASSERT(ul_tbf->m_llc.m_index == 43); + OSMO_ASSERT(ul_tbf->m_llc.index == 43); return ul_tbf; } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/27622 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Ia5272841392110b87725e87a7e6824c17a70d6d1 Gerrit-Change-Number: 27622 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-bsc[master]: abis_rsl: always check return value of rsl_tlv_parse()
by laforge 01 Apr '22

01 Apr '22

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27620 ) Change subject: abis_rsl: always check return value of rsl_tlv_parse() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27620/comment/9073e797_aaec0ecc PS1, Line 1224: if (rsl_tlv_parse(&tp, dh->data, msgb_l2len(msg) - sizeof(*dh)) < 0) { > You probably need to check that msgb_l2len(msg) >= sizeof(*dh) before derreferencing dh below. […] abis_rsl_rcvmsg() is checking for 'sizeof(struct abis_rsl_common_hdr)' length. Since only dh->c ('c' is the common part) is dereferenced, it's fine. However, I think the check for the larger 'sizeof(struct abis_rsl_rx_dchan)' should go into the start of abis_rsl_rx_dchan(), whre we already dereference the chan_nr information element. Unrelated additional patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27620 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id022628934e7d51ce66cb255baa88f24bf5c918a Gerrit-Change-Number: 27620 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:42:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn
by laforge 01 Apr '22

01 Apr '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27618 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... fix gsm_bts_get_cbch(): CBCH can be allocated on Cn According to 3GPP TS 45.002, table 3, unlike the CCCH+SDCCH/4+CBCH combination, which can only be allocated on C0/TS0, the SDCCH/8+CBCH can be allocated on C0..n/TS0..3. In other words, having CBCH on e.g. TRX1/C1 is perfectly legal. This is why in gsm_bts_get_cbch() we should check all transceivers, not just the C0. Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Related: SYS#5905 --- M src/osmo-bsc/bts.c 1 file changed, 11 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index d09aa48..843d711 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -562,22 +562,23 @@ /* return the gsm_lchan for the CBCH (if it exists at all) */ struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts) { - struct gsm_lchan *lchan = NULL; struct gsm_bts_trx *trx = bts->c0; + /* According to 3GPP TS 45.002, table 3, CBCH can be allocated + * either on C0/TS0 (CCCH+SDCCH4) or on C0..n/TS0..3 (SDCCH/8). */ if (trx->ts[0].pchan_from_config == GSM_PCHAN_CCCH_SDCCH4_CBCH) - lchan = &trx->ts[0].lchan[2]; - else { - int i; - for (i = 0; i < 8; i++) { - if (trx->ts[i].pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) { - lchan = &trx->ts[i].lchan[2]; - break; - } + return &trx->ts[0].lchan[2]; /* C0/TS0 */ + + llist_for_each_entry(trx, &bts->trx_list, list) { /* C0..n */ + unsigned int tn; + for (tn = 0; tn < 4; tn++) { /* TS0..3 */ + struct gsm_bts_trx_ts *ts = &trx->ts[tn]; + if (ts->pchan_from_config == GSM_PCHAN_SDCCH8_SACCH8C_CBCH) + return &ts->lchan[2]; } } - return lchan; + return NULL; } int gsm_set_bts_type(struct gsm_bts *bts, enum gsm_bts_type type) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27618 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie79ccff4f8f0f1134757ec0c35e18b58081cc158 Gerrit-Change-Number: 27618 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc[master]: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/
by laforge 01 Apr '22

01 Apr '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27617 ) Change subject: cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ ...................................................................... cbch_scheduler: cosmetic: s/bts_cbch_timer/bts_cbch_timer_cb/ Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd --- M src/osmo-bsc/cbch_scheduler.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/cbch_scheduler.c b/src/osmo-bsc/cbch_scheduler.c index 1bdf5e7..c66f743 100644 --- a/src/osmo-bsc/cbch_scheduler.c +++ b/src/osmo-bsc/cbch_scheduler.c @@ -246,7 +246,7 @@ bts_smscb_page_done(cstate, page); } -static void bts_cbch_timer(void *data) +static void bts_cbch_timer_cb(void *data) { struct gsm_bts *bts = (struct gsm_bts *)data; @@ -259,7 +259,7 @@ /* There is one SMSCB message (page) per eight 51-multiframes, i.e. 1.882 seconds */ void bts_cbch_timer_schedule(struct gsm_bts *bts) { - osmo_timer_setup(&bts->cbch_timer, &bts_cbch_timer, bts); + osmo_timer_setup(&bts->cbch_timer, &bts_cbch_timer_cb, bts); osmo_timer_schedule(&bts->cbch_timer, 1, 882920); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibff3045d8066b644b437e46330848ebadfb373fd Gerrit-Change-Number: 27617 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc[master]: fix bts_cbch_send_one(): use proper RSL Channel Number
by laforge 01 Apr '22

01 Apr '22

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27619 ) Change subject: fix bts_cbch_send_one(): use proper RSL Channel Number ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: the question is whether it really matters, and whether it is really specified. 48.058 section 9.3.1 doesn't give any encoding for the CBCH... and Section 8.5.8 doesn't really state anything about how to populate the Channel Number IE in this situation either. Since the CBCH handling ina BTS is something "central" that only exists once, it doesn't really make sense at all sending it to a specific lchan at a specific TS. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27619 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5fd00bfd5e762ce0a56e73816162d0555976f8d Gerrit-Change-Number: 27619 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:37:22 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn
by pespin 01 Apr '22

01 Apr '22

Attention is currently required from: laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27621 ) Change subject: fix gsm_bts_get_cbch(): CBCH can be allocated on Cn ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ib5976783b53521047fbdfc18e0e236e8bce8eaae Gerrit-Change-Number: 27621 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 31 Mar 2022 17:33:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log