- gerrit-log - lists.osmocom.org

Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H
by fixeria 11 Apr '22

11 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27722 ) Change subject: osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H ...................................................................... osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H Since change [1], in rts_tchh_fn() we're using a lookup table for DL FACCH/H. Let's do the same for UL FACCH/H in rx_tchh_fn(). Change-Id: I7c4e3befdd33bef4d89a04a4c7cb1a2d4078c156 Related: [1] I3dba243e5a1b7c8008ef0178ea18ed885256c50d Related: SYS#5916, OS#5518 --- M src/osmo-bts-trx/sched_lchan_tchh.c 1 file changed, 18 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index f0d8ff6..05e8e7e 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -64,6 +64,17 @@ [3] = 1, /* TCH/H(1): a=18 / d=24 / f=3 */ }; +/* 3GPP TS 45.002, table 1 in clause 7: Mapping tables. + * TDMA frame number of burst 'f' is always used as the table index. */ +static const uint8_t sched_tchh_ul_facch_map[26] = { + [10] = 1, /* FACCH/H(0): B0(0,2,4,6,8,10) */ + [11] = 1, /* FACCH/H(1): B0(1,3,5,7,9,11) */ + [19] = 1, /* FACCH/H(0): B1(8,10,13,15,17,19) */ + [20] = 1, /* FACCH/H(1): B1(9,11,14,16,18,20) */ + [2] = 1, /* FACCH/H(0): B2(17,19,21,23,0,2) */ + [3] = 1, /* FACCH/H(1): B2(18,20,22,24,1,3) */ +}; + /*! \brief a single TCH/H burst was received by the PHY, process it */ int rx_tchh_fn(struct l1sched_ts *l1ts, const struct trx_ul_burst_ind *bi) { @@ -78,11 +89,6 @@ int n_errors = 0; int n_bits_total = 0; bool bfi_flag = false; - /* Note on FN-10: If we are at FN 10, we decoded an even aligned - * TCH/FACCH frame, because our burst buffer carries 6 bursts. - * Even FN ending at: 10,11,19,20,2,3 - */ - int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1; enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_S6N4; struct l1sched_meas_set meas_avg; unsigned int fn_begin; @@ -157,12 +163,9 @@ meas_avg_mode = SCHED_MEAS_AVG_M_S6N6; /* fall-through */ case GSM48_CMODE_SPEECH_V1: /* HR or signalling */ - /* Note on FN-10: If we are at FN 10, we decoded an even aligned - * TCH/FACCH frame, because our burst buffer carries 6 bursts. - * Even FN ending at: 10,11,19,20,2,3 - */ rc = gsm0503_tch_hr_decode(tch_data, *bursts_p, - fn_is_odd, &n_errors, &n_bits_total); + !sched_tchh_ul_facch_map[bi->fn % 26], + &n_errors, &n_bits_total); if (rc == (GSM_HR_BYTES + 1)) { /* only for valid *speech* frames */ /* gsm0503_tch_hr_decode() prepends a ToC octet (see RFC5993), skip it */ bool is_sid = osmo_hr_check_sid(&tch_data[1], GSM_HR_BYTES); @@ -191,9 +194,11 @@ /* See comment in function rx_tchf_fn() */ amr = 2; rc = gsm0503_tch_ahs_decode_dtx(tch_data + amr, *bursts_p, - fn_is_odd, !fn_is_cmi, chan_state->codec, - chan_state->codecs, &chan_state->ul_ft, - &chan_state->ul_cmr, &n_errors, &n_bits_total, &chan_state->amr_last_dtx); + !sched_tchh_ul_facch_map[bi->fn % 26], + !fn_is_cmi, chan_state->codec, + chan_state->codecs, &chan_state->ul_ft, + &chan_state->ul_cmr, &n_errors, &n_bits_total, + &chan_state->amr_last_dtx); /* Tag all frames that are not regular AMR voice frames as SUB-Frames */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7c4e3befdd33bef4d89a04a4c7cb1a2d4078c156 Gerrit-Change-Number: 27722 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bts[master]: scheduler: remove redundant OSMO_ASSERT() statements
by fixeria 11 Apr '22

11 Apr '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27720 ) Change subject: scheduler: remove redundant OSMO_ASSERT() statements ...................................................................... scheduler: remove redundant OSMO_ASSERT() statements It's guaranteed by the calling function bts_model_l1sap_down() that the prim's operation is PRIM_OP_REQUEST and that the msg is present. Change-Id: I6a01bba7b5eb337ae1552c442d74447565c52e25 --- M src/common/scheduler.c 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e6a664f..99ab597 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -854,9 +854,6 @@ "PH-DATA.req: chan_nr=0x%02x link_id=0x%02x\n", l1sap->u.data.chan_nr, l1sap->u.data.link_id); - OSMO_ASSERT(l1sap->oph.operation == PRIM_OP_REQUEST); - OSMO_ASSERT(l1sap->oph.msg); - /* ignore empty frame */ if (!l1sap->oph.msg->l2h || msgb_l2len(l1sap->oph.msg) == 0) { msgb_free(l1sap->oph.msg); @@ -880,9 +877,6 @@ LOGL1S(DL1P, LOGL_DEBUG, l1ts, -1, l1sap->u.tch.fn, "TCH.req: chan_nr=0x%02x\n", l1sap->u.tch.chan_nr); - OSMO_ASSERT(l1sap->oph.operation == PRIM_OP_REQUEST); - OSMO_ASSERT(l1sap->oph.msg); - /* ignore empty frame */ if (!msgb_l2len(l1sap->oph.msg)) { msgb_free(l1sap->oph.msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6a01bba7b5eb337ae1552c442d74447565c52e25 Gerrit-Change-Number: 27720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bts[master]: scheduler: remove redundant OSMO_ASSERT() statements
by fixeria 11 Apr '22

11 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27720 ) Change subject: scheduler: remove redundant OSMO_ASSERT() statements ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: > That's precisely the point of the asserts, to describe and check that "guaranteed" situation, so tha […] Yes, I agree with the concept in general. But on the other hand we should not put assert()s everywhere to address every possible failure vector. In this context it's hard to imagine why would somebody change bts_model_l1sap_down() to call this function on receipt of a different prim type, given that it's clear from the function name what kind of the input it expects... -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27720 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6a01bba7b5eb337ae1552c442d74447565c52e25 Gerrit-Change-Number: 27720 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 13:37:23 +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-bts[master]: osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H
by pespin 11 Apr '22

11 Apr '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27722 ) Change subject: osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27722/comment/e4415baf_66b40148 PS1, Line 85: int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1; > I am not a big fan of this kind of functions, sorry. This statement: […] It may be self explaining to you after having read the specs, I can tell you it's not safe explaining to me, at least without further investigation. Having fn_is_facch() is self explanatory. Just sharing my view here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7c4e3befdd33bef4d89a04a4c7cb1a2d4078c156 Gerrit-Change-Number: 27722 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 13:34:56 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bsc-nat[master]: bsc_nat_fsm: check for error from get_next_id_ran
by osmith 11 Apr '22

11 Apr '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27728 ) Change subject: bsc_nat_fsm: check for error from get_next_id_ran ...................................................................... bsc_nat_fsm: check for error from get_next_id_ran Related: SYS#5560 Change-Id: Ic55ba119e9c736c396f06a58ec9bc1f4682e9b11 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 2a32c9d..d7f8aa3 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -200,7 +200,12 @@ goto error; } - subscr_conn = subscr_conn_alloc(msc, bsc, subscr_conn_get_next_id_ran(), prim->u.connect.conn_id); + rc = subscr_conn_get_next_id_ran(); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Failed to get next_id_ran\n"); + goto error; + } + subscr_conn = subscr_conn_alloc(msc, bsc, rc, prim->u.connect.conn_id); LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27728 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ic55ba119e9c736c396f06a58ec9bc1f4682e9b11 Gerrit-Change-Number: 27728 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc-nat[master]: Make subscr_conn_get_next_id RAN specific
by osmith 11 Apr '22

11 Apr '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27711 ) Change subject: Make subscr_conn_get_next_id RAN specific ...................................................................... Make subscr_conn_get_next_id RAN specific Instead of having RAN/CN as parameter, make the function a bit simpler and only allow RAN. The motivation for this change is, that for MGW a similar function is required, and it was recommended in code review to rather duplicate the short function instead of making it more complex. I'm dropping the CN part here since it wasn't used anyway, and if used in the future, the function could be duplicated for CN as well. Related: SYS#5560 Change-Id: I77b0ef33f94c401d24f38eb8d79e1007234e0ab4 --- M include/osmocom/bsc_nat/subscr_conn.h M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/subscr_conn.c 3 files changed, 5 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/subscr_conn.h b/include/osmocom/bsc_nat/subscr_conn.h index 7de3f0f..02a0019 100644 --- a/include/osmocom/bsc_nat/subscr_conn.h +++ b/include/osmocom/bsc_nat/subscr_conn.h @@ -36,7 +36,7 @@ } ran; }; -int subscr_conn_get_next_id(enum bsc_nat_net net); +int subscr_conn_get_next_id_ran(); struct subscr_conn *subscr_conn_alloc(struct msc *msc, struct bsc *bsc, uint32_t id_cn, uint32_t id_ran); diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 22413ef..2a32c9d 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -200,7 +200,7 @@ goto error; } - subscr_conn = subscr_conn_alloc(msc, bsc, subscr_conn_get_next_id(BSC_NAT_NET_CN), prim->u.connect.conn_id); + subscr_conn = subscr_conn_alloc(msc, bsc, subscr_conn_get_next_id_ran(), prim->u.connect.conn_id); LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); diff --git a/src/osmo-bsc-nat/subscr_conn.c b/src/osmo-bsc-nat/subscr_conn.c index 02afb7d..a94287c 100644 --- a/src/osmo-bsc-nat/subscr_conn.c +++ b/src/osmo-bsc-nat/subscr_conn.c @@ -26,15 +26,9 @@ #include <osmocom/bsc_nat/subscr_conn.h> #include <osmocom/bsc_nat/logging.h> -/* Get the next available id in either CN or RAN. */ -int subscr_conn_get_next_id(enum bsc_nat_net net) +int subscr_conn_get_next_id_ran() { - uint32_t *id; - - if (net == BSC_NAT_NET_RAN) - id = &g_bsc_nat->ran.subscr_conn_id_next; - else - id = &g_bsc_nat->cn.subscr_conn_id_next; + uint32_t *id = &g_bsc_nat->ran.subscr_conn_id_next; for (int i = 0; i < 0xFFFFFF; i++) { struct subscr_conn *subscr_conn; @@ -43,8 +37,7 @@ *id = (*id + 1) & 0xffffff; llist_for_each_entry(subscr_conn, &g_bsc_nat->subscr_conns, list) { - if ((net == BSC_NAT_NET_RAN && subscr_conn->ran.id == *id) - || (net == BSC_NAT_NET_CN && subscr_conn->cn.id == *id)) { + if (*id == subscr_conn->ran.id) { already_used = true; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I77b0ef33f94c401d24f38eb8d79e1007234e0ab4 Gerrit-Change-Number: 27711 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc-nat[master]: Parse BSSMAP in conn-oriented data
by osmith 11 Apr '22

11 Apr '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27710 ) Change subject: Parse BSSMAP in conn-oriented data ...................................................................... Parse BSSMAP in conn-oriented data Add functions to parse the BSSMAP part of BSSAP messages, and in theory do other things than just forwarding the messages depending on the BSSMAP message type. This will be used in follow-up patches to change the AoIP transport layer address in Assignment Request and related messages. Related: SYS#5560 Change-Id: I3e2599a9a07925afdbe69f7b8dbcec227681dfa2 --- M include/osmocom/bsc_nat/bssap.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc_nat_fsm.c A src/osmo-bsc-nat/bssap_conn.c 4 files changed, 129 insertions(+), 16 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmocom/bsc_nat/bssap.h b/include/osmocom/bsc_nat/bssap.h index 7f45a2f..3fecc7d 100644 --- a/include/osmocom/bsc_nat/bssap.h +++ b/include/osmocom/bsc_nat/bssap.h @@ -22,7 +22,13 @@ #include <osmocom/core/msgb.h> #include <osmocom/bsc_nat/bsc_nat.h> +/* connection-less */ int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, unsigned int length); int bssmap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr); + +/* connection-oriented */ +struct subscr_conn; + +int bssap_handle_dt(enum bsc_nat_net net, struct subscr_conn *subscr_conn, struct msgb *msgb, unsigned int length); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 1ddb8ca..e3f7305 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -30,6 +30,7 @@ bsc_nat.c \ bsc_nat_fsm.c \ bssap.c \ + bssap_conn.c \ logging.c \ main.c \ msc.c \ diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index eae2f5e..22413ef 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -126,14 +126,7 @@ goto error; } - LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); - - msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_data(g_bsc_nat->ran.sccp_inst->scu, - subscr_conn->ran.id, - oph->msg->data, - msgb_length(oph->msg)); - rc = 0; + rc = bssap_handle_dt(BSC_NAT_NET_CN, subscr_conn, oph->msg, msgb_l2len(oph->msg)); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): @@ -253,14 +246,7 @@ goto error; } - LOGP(DMAIN, LOGL_DEBUG, "Fwd via %s\n", talloc_get_name(subscr_conn)); - - msgb_pull_to_l2(oph->msg); - osmo_sccp_tx_data(g_bsc_nat->cn.sccp_inst->scu, - subscr_conn->cn.id, - oph->msg->data, - msgb_length(oph->msg)); - rc = 0; + rc = bssap_handle_dt(BSC_NAT_NET_RAN, subscr_conn, oph->msg, msgb_l2len(oph->msg)); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION): diff --git a/src/osmo-bsc-nat/bssap_conn.c b/src/osmo-bsc-nat/bssap_conn.c new file mode 100644 index 0000000..10b3a01 --- /dev/null +++ b/src/osmo-bsc-nat/bssap_conn.c @@ -0,0 +1,120 @@ +/* (C) 2022 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include "config.h" +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/gsm0808.h> +#include <osmocom/sigtran/sccp_helpers.h> +#include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/subscr_conn.h> + +static int bssap_fwd_to_cn(struct subscr_conn *subscr_conn, struct msgb *msg, unsigned int length) +{ + LOGP(DMAIN, LOGL_DEBUG, "Fwd BSSAP to CN via %s\n", talloc_get_name(subscr_conn)); + + msgb_pull_to_l2(msg); + + return osmo_sccp_tx_data(g_bsc_nat->cn.sccp_inst->scu, subscr_conn->cn.id, msg->data, msgb_length(msg)); +} + +static int bssap_fwd_to_ran(struct subscr_conn *subscr_conn, struct msgb *msg, unsigned int length) +{ + LOGP(DMAIN, LOGL_DEBUG, "Fwd BSSAP to RAN via %s\n", talloc_get_name(subscr_conn)); + + msgb_pull_to_l2(msg); + + return osmo_sccp_tx_data(g_bsc_nat->ran.sccp_inst->scu, subscr_conn->ran.id, msg->data, msgb_length(msg)); +} + +static int bssmap_cn_rcvmsg_dt(struct subscr_conn *subscr_conn, struct msgb *msg, unsigned int length) +{ + int ret = 0; + + switch (msg->l3h[0]) { + default: + ret = bssap_fwd_to_ran(subscr_conn, msg, length); + break; + } + + return ret; +} + +static int bssmap_ran_rcvmsg_dt(struct subscr_conn *subscr_conn, struct msgb *msg, unsigned int length) +{ + int ret = 0; + + switch (msg->l3h[0]) { + default: + ret = bssap_fwd_to_cn(subscr_conn, msg, length); + break; + } + + return ret; +} + +static int bssmap_rcvmsg_dt(enum bsc_nat_net net, struct subscr_conn *subscr_conn, struct msgb *msg, + unsigned int length) +{ + if (length < 1) { + LOGP(DMAIN, LOGL_ERROR, "Not enough room: %u\n", length); + return -1; + } + + LOGP(DMAIN, LOGL_NOTICE, "Rx DT BSSMAP %s\n", gsm0808_bssmap_name(msg->l3h[0])); + + if (net == BSC_NAT_NET_CN) + return bssmap_cn_rcvmsg_dt(subscr_conn, msg, length); + return bssmap_ran_rcvmsg_dt(subscr_conn, msg, length); +} + +int bssap_handle_dt(enum bsc_nat_net net, struct subscr_conn *subscr_conn, struct msgb *msgb, unsigned int length) +{ + struct bssmap_header *bs; + int rc = -1; + + LOGP(DMAIN, LOGL_DEBUG, "Rx DT: %s\n", osmo_hexdump(msgb->l2h, length)); + + if (length < sizeof(*bs)) { + LOGP(DMAIN, LOGL_ERROR, "The header is too short\n"); + return -1; + } + + switch (msgb->l2h[0]) { + case BSSAP_MSG_BSS_MANAGEMENT: + bs = (struct bssmap_header *)msgb->l2h; + if (bs->length < length - sizeof(*bs)) { + LOGP(DMAIN, LOGL_ERROR, "Failed to parse BSSMAP header\n"); + return -1; + } + msgb->l3h = &msgb->l2h[sizeof(*bs)]; + rc = bssmap_rcvmsg_dt(net, subscr_conn, msgb, length - sizeof(*bs)); + break; + case BSSAP_MSG_DTAP: + LOGP(DMAIN, LOGL_DEBUG, "Rx DT DTAP\n"); + if (net == BSC_NAT_NET_CN) + rc = bssap_fwd_to_ran(subscr_conn, msgb, length); + else + rc = bssap_fwd_to_cn(subscr_conn, msgb, length); + break; + default: + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssap_name(msgb->l2h[0])); + } + + return rc; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3e2599a9a07925afdbe69f7b8dbcec227681dfa2 Gerrit-Change-Number: 27710 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-bsc-nat[master]: Parse BSSMAP in conn-oriented data
by osmith 11 Apr '22

11 Apr '22

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27710 ) Change subject: Parse BSSMAP in conn-oriented data ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27710 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: I3e2599a9a07925afdbe69f7b8dbcec227681dfa2 Gerrit-Change-Number: 27710 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 13:20:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H
by fixeria 11 Apr '22

11 Apr '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27722 ) Change subject: osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27722/comment/d3b98858_1e14fdb5 PS1, Line 85: int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1; > Then having a static inline function fn_is_facch which does "!sched_tchh_ul_facch_map[bi->fn % 26]" […] I am not a big fan of this kind of functions, sorry. This statement: sched_tchh_ul_facch_map[bi->fn % 26] is self-explaining, IMO. The negation is required because gsm0503_tch_hr_decode() involves double-negation: it would try to decode the buffer as FACCH/H if its argument 'odd' is false. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7c4e3befdd33bef4d89a04a4c7cb1a2d4078c156 Gerrit-Change-Number: 27722 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 13:18:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H
by pespin 11 Apr '22

11 Apr '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27722 ) Change subject: osmo-bts-trx: rx_tchh_fn(): use a lookup table for FACCH/H ...................................................................... Patch Set 1: (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27722/comment/51ac4a16_9f609060 PS1, Line 85: int fn_is_odd = (((bi->fn + 26 - 10) % 26) >> 2) & 1; > Yes, this naming looks weird to me too. 'fn_is_facch' would have been a lot cleaner. […] Then having a static inline function fn_is_facch which does "!sched_tchh_ul_facch_map[bi->fn % 26]" would be helpful to understand better the code imho. I'd welcome it at least. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27722 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7c4e3befdd33bef4d89a04a4c7cb1a2d4078c156 Gerrit-Change-Number: 27722 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Apr 2022 12:55:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2026

2025

2024

2023

2022

gerrit-log