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

[S] Change in pysim[master]: sim-reset-server: fix error printing sw_match_error
by dexter 06 Sep '23

06 Sep '23

Attention is currently required from: fixeria, laforge, osmith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34155?usp=email ) Change subject: sim-reset-server: fix error printing sw_match_error ...................................................................... Patch Set 3: (1 comment) File contrib/sim-rest-server.py: https://gerrit.osmocom.org/c/pysim/+/34155/comment/486cf218_7f173f4c PS2, Line 104: ), sw) > We actually have a syntax issue here: […] Thanks. I didn't see this - now it works fine. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34155?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5a1d19abeb00c2c9dc26517abc44a5c916f2d658 Gerrit-Change-Number: 34155 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 06 Sep 2023 11:06:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: sim-reset-server: fix error printing sw_match_error
by dexter 06 Sep '23

06 Sep '23

Attention is currently required from: fixeria, laforge, osmith. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/34155?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: sim-reset-server: fix error printing sw_match_error ...................................................................... sim-reset-server: fix error printing sw_match_error In the last line of the if,elif,else branch, when we print the ApiError object, we pass the variable sw to str() instead passing it to ApiError() like we do it in the lines above. This is not correct and causes strange exceptions. Related: OS#67094 Change-Id: I5a1d19abeb00c2c9dc26517abc44a5c916f2d658 --- M contrib/sim-rest-server.py 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/55/34155/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34155?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I5a1d19abeb00c2c9dc26517abc44a5c916f2d658 Gerrit-Change-Number: 34155 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bsc[master]: struct gsm_bts_trx[_ts], gsm_abis_mo: drop unused nm_attr
by fixeria 06 Sep '23

06 Sep '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34324?usp=email ) Change subject: struct gsm_bts_trx[_ts], gsm_abis_mo: drop unused nm_attr ...................................................................... struct gsm_bts_trx[_ts], gsm_abis_mo: drop unused nm_attr Change-Id: I36c3aaefa0bd9ee946a53ed537cf5c3bd7e9761e --- M include/osmocom/bsc/bts_trx.h M include/osmocom/bsc/gsm_data.h 2 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/24/34324/1 diff --git a/include/osmocom/bsc/bts_trx.h b/include/osmocom/bsc/bts_trx.h index 8d2493f..8ded559 100644 --- a/include/osmocom/bsc/bts_trx.h +++ b/include/osmocom/bsc/bts_trx.h @@ -43,7 +43,6 @@ struct e1inp_sign_link *oml_link; struct gsm_abis_mo mo; - struct tlv_parsed nm_attr; struct gsm_bts_bb_trx bb_transc; uint16_t arfcn; diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 7d36baa..7f79162 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -526,7 +526,6 @@ struct abis_om_obj_inst obj_inst; const char *name; struct gsm_nm_state nm_state; - struct tlv_parsed *nm_attr; struct gsm_bts *bts; struct osmo_fsm_inst *fi; bool opstart_sent; @@ -668,7 +667,6 @@ bool is_rsl_ready; struct gsm_abis_mo mo; - struct tlv_parsed nm_attr; uint8_t nm_chan_comb; int tsc; /* -1 == use BTS TSC */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34324?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I36c3aaefa0bd9ee946a53ed537cf5c3bd7e9761e Gerrit-Change-Number: 34324 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: abis_nm: separate parsing of osmo-bts features into a function
by pespin 06 Sep '23

06 Sep '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34322?usp=email ) Change subject: abis_nm: separate parsing of osmo-bts features into a function ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34322?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia5919a8311cd6a7fc16d02d2196276881e96f4c5 Gerrit-Change-Number: 34322 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Sep 2023 22:10:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: bts_siemens_bs11: remove ip.access nanoBTS specific code
by pespin 06 Sep '23

06 Sep '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34321?usp=email ) Change subject: bts_siemens_bs11: remove ip.access nanoBTS specific code ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34321?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2db92fe448b1f4cd25c1e5c6e1bb9593795c9cb2 Gerrit-Change-Number: 34321 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Sep 2023 22:09:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: ms: logging: print category, level, and extended timestamp
by pespin 06 Sep '23

06 Sep '23

Attention is currently required from: Hoernchen, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/34320?usp=email ) Change subject: ms: logging: print category, level, and extended timestamp ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34320?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I14da3c9e77681268e4f575a6ca7220eedbf2a7a5 Gerrit-Change-Number: 34320 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 05 Sep 2023 22:08:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: abis_nm: parse feature flags in NM_ATT_IPACC_SUPP_FEATURES
by fixeria 05 Sep '23

05 Sep '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34323?usp=email ) Change subject: abis_nm: parse feature flags in NM_ATT_IPACC_SUPP_FEATURES ...................................................................... abis_nm: parse feature flags in NM_ATT_IPACC_SUPP_FEATURES Since change [1], among with the other attributes we started requesting NM_ATT_IPACC_SUPP_FEATURES from the BTS. This patch adds the logic for parsing the response (so far only printing supported features). Change-Id: I64cffa0bdead3617cc169c83b0f6ddf74f0866a7 Related: [1] 43440e1fc5758c52e80a0d182afa7c9d16b21426 Depends: libosmocore.git Ia4208e10d61843dd6ae77398f6624c918dc81ea4 --- M include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h M src/osmo-bsc/abis_nm.c M src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c 3 files changed, 89 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/23/34323/1 diff --git a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h index dd97a0a..23d5a2e 100644 --- a/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h +++ b/include/osmocom/bsc/bts_ipaccess_nanobts_omlattr.h @@ -23,12 +23,15 @@ #include <stdint.h> #include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> struct gsm_bts_sm; struct gsm_bts; struct gsm_bts_trx; struct gsm_gprs_nsvc; +extern const struct tlv_definition ipacc_eie_tlv_def; + struct msgb *nanobts_gen_set_bts_attr(struct gsm_bts *bts); struct msgb *nanobts_gen_set_nse_attr(struct gsm_bts_sm *bts_sm); struct msgb *nanobts_gen_set_cell_attr(struct gsm_bts *bts); diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 2f49424..1434e9c 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -52,6 +52,7 @@ #include <osmocom/bsc/nm_common_fsm.h> #include <osmocom/gsm/bts_features.h> #include <osmocom/bsc/ipaccess.h> +#include <osmocom/bsc/bts_ipaccess_nanobts_omlattr.h> #define OM_ALLOC_SIZE 1024 #define OM_HEADROOM_SIZE 128 @@ -600,6 +601,56 @@ } } +static inline uint32_t parse_ipacc_supp_flags(const struct abis_om_fom_hdr *foh, + const struct value_string *flags, + const struct tlv_p_entry *e, + const char *text) +{ + uint32_t u32 = 0; + + for (unsigned int i = 0; i < OSMO_MAX(e->len, 4); i++) + u32 |= e->val[i] << (i * 8); + for (const struct value_string *vs = flags; vs->value && vs->str; vs++) { + if (u32 & vs->value) + LOGPFOH(DNM, LOGL_ERROR, foh, "%s '%s' is supported\n", text, vs->str); + } + + return u32; +} + +/* Parse ip.access Supported Features IE */ +static int parse_ipacc_supp_features(const struct gsm_bts *bts, + const struct abis_om_fom_hdr *foh, + const uint8_t *data, uint16_t data_len) +{ + const struct tlv_p_entry *e; + struct tlv_parsed tp; + + if (tlv_parse(&tp, &ipacc_eie_tlv_def, data, data_len, 0, 0) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } + + /* TODO: store the flags in the respective MO state */ + if ((e = TLVP_GET(&tp, NM_IPAC_EIE_FREQ_BANDS)) != NULL) + parse_ipacc_supp_flags(foh, abis_nm_ipacc_freq_band_desc, e, "Freq. band"); + if ((e = TLVP_GET(&tp, NM_IPAC_EIE_CIPH_ALGOS)) != NULL) + parse_ipacc_supp_flags(foh, abis_nm_ipacc_freq_band_desc, e, "Ciphering algorithm"); + if ((e = TLVP_GET(&tp, NM_IPAC_EIE_CHAN_TYPES)) != NULL) + parse_ipacc_supp_flags(foh, abis_nm_ipacc_chant_desc, e, "Channel type"); + if ((e = TLVP_GET(&tp, NM_IPAC_EIE_CHAN_MODES)) != NULL) + parse_ipacc_supp_flags(foh, abis_nm_ipacc_chanm_desc, e, "Channel mode"); + if ((e = TLVP_GET(&tp, NM_IPAC_EIE_GPRS_CODING)) != NULL) + parse_ipacc_supp_flags(foh, abis_nm_ipacc_gprs_coding_desc, e, "GPRS Coding Scheme"); + if ((e = TLVP_GET(&tp, NM_IPAC_EIE_RTP_FEATURES)) != NULL) + parse_ipacc_supp_flags(foh, abis_nm_ipacc_rtp_feat_desc, e, "RTP Feature"); + if ((e = TLVP_GET(&tp, NM_IPAC_EIE_RSL_FEATURES)) != NULL) + parse_ipacc_supp_flags(foh, abis_nm_ipacc_rsl_feat_desc, e, "RSL Feature"); + /* TODO: parse NM_IPAC_EIE_MAX_TA */ + + return 0; +} + /* Handle 3GPP TS 52.021 §8.11.3 Get Attribute Response (with nanoBTS specific attribute formatting) */ static int parse_attr_resp_info_attr(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { @@ -618,6 +669,12 @@ parse_osmo_bts_features(bts, TLVP_VAL(tp, NM_ATT_MANUF_ID), TLVP_LEN(tp, NM_ATT_MANUF_ID)); } + /* fall-through */ + case GSM_BTS_TYPE_NANOBTS: + if (TLVP_PRESENT(tp, NM_ATT_IPACC_SUPP_FEATURES)) { + parse_ipacc_supp_features(bts, foh, TLVP_VAL(tp, NM_ATT_IPACC_SUPP_FEATURES), + TLVP_LEN(tp, NM_ATT_IPACC_SUPP_FEATURES)); + } break; default: break; diff --git a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c index d78f23b..167383d 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c @@ -26,6 +26,20 @@ #include <osmocom/bsc/bts.h> #include <osmocom/gsm/bts_features.h> +const struct tlv_definition ipacc_eie_tlv_def = { + .def = { + /* TODO: add more values from enum ipac_eie */ + [NM_IPAC_EIE_FREQ_BANDS] = { TLV_TYPE_TL16V }, + [NM_IPAC_EIE_MAX_TA] = { TLV_TYPE_TL16V }, + [NM_IPAC_EIE_CIPH_ALGOS] = { TLV_TYPE_TL16V }, + [NM_IPAC_EIE_CHAN_TYPES] = { TLV_TYPE_TL16V }, + [NM_IPAC_EIE_CHAN_MODES] = { TLV_TYPE_TL16V }, + [NM_IPAC_EIE_GPRS_CODING] = { TLV_TYPE_TL16V }, + [NM_IPAC_EIE_RTP_FEATURES] = { TLV_TYPE_TL16V }, + [NM_IPAC_EIE_RSL_FEATURES] = { TLV_TYPE_TL16V }, + } +}; + /* 3GPP TS 52.021 section 8.6.1 Set BTS Attributes */ struct msgb *nanobts_gen_set_bts_attr(struct gsm_bts *bts) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34323?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I64cffa0bdead3617cc169c83b0f6ddf74f0866a7 Gerrit-Change-Number: 34323 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: bts_siemens_bs11: remove ip.access nanoBTS specific code
by fixeria 05 Sep '23

05 Sep '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34321?usp=email ) Change subject: bts_siemens_bs11: remove ip.access nanoBTS specific code ...................................................................... bts_siemens_bs11: remove ip.access nanoBTS specific code This code is unreachable, because this file is all about Siemens BS11. Change-Id: I2db92fe448b1f4cd25c1e5c6e1bb9593795c9cb2 --- M src/osmo-bsc/bts_siemens_bs11.c 1 file changed, 34 insertions(+), 45 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/34321/1 diff --git a/src/osmo-bsc/bts_siemens_bs11.c b/src/osmo-bsc/bts_siemens_bs11.c index d1fbeaa..7aa437c 100644 --- a/src/osmo-bsc/bts_siemens_bs11.c +++ b/src/osmo-bsc/bts_siemens_bs11.c @@ -423,57 +423,35 @@ patch_nm_tables(trx->bts); - switch (trx->bts->type) { - case GSM_BTS_TYPE_BS11: - /* FIXME: discover this by fetching an attribute */ + /* FIXME: discover this by fetching an attribute */ #if 0 - trx->nominal_power = 15; /* 15dBm == 30mW PA configuration */ + trx->nominal_power = 15; /* 15dBm == 30mW PA configuration */ #else - trx->nominal_power = 24; /* 24dBm == 250mW PA configuration */ + trx->nominal_power = 24; /* 24dBm == 250mW PA configuration */ #endif - abis_nm_conn_terr_sign(trx, e1l->e1_nr, e1l->e1_ts, - e1l->e1_ts_ss); - abis_nm_establish_tei(trx->bts, trx->nr, e1l->e1_nr, - e1l->e1_ts, e1l->e1_ts_ss, trx->rsl_tei_primary); + abis_nm_conn_terr_sign(trx, e1l->e1_nr, e1l->e1_ts, + e1l->e1_ts_ss); + abis_nm_establish_tei(trx->bts, trx->nr, e1l->e1_nr, + e1l->e1_ts, e1l->e1_ts_ss, trx->rsl_tei_primary); - /* Set Radio Attributes */ - if (trx == trx->bts->c0) - abis_nm_set_radio_attr(trx, bs11_attr_radio, - sizeof(bs11_attr_radio)); - else { - uint8_t trx1_attr_radio[sizeof(bs11_attr_radio)]; - uint8_t arfcn_low = trx->arfcn & 0xff; - uint8_t arfcn_high = (trx->arfcn >> 8) & 0x0f; - memcpy(trx1_attr_radio, bs11_attr_radio, - sizeof(trx1_attr_radio)); + /* Set Radio Attributes */ + if (trx == trx->bts->c0) + abis_nm_set_radio_attr(trx, bs11_attr_radio, + sizeof(bs11_attr_radio)); + else { + uint8_t trx1_attr_radio[sizeof(bs11_attr_radio)]; + uint8_t arfcn_low = trx->arfcn & 0xff; + uint8_t arfcn_high = (trx->arfcn >> 8) & 0x0f; + memcpy(trx1_attr_radio, bs11_attr_radio, + sizeof(trx1_attr_radio)); - /* patch ARFCN into TRX Attributes */ - trx1_attr_radio[2] &= 0xf0; - trx1_attr_radio[2] |= arfcn_high; - trx1_attr_radio[3] = arfcn_low; + /* patch ARFCN into TRX Attributes */ + trx1_attr_radio[2] &= 0xf0; + trx1_attr_radio[2] |= arfcn_high; + trx1_attr_radio[3] = arfcn_low; - abis_nm_set_radio_attr(trx, trx1_attr_radio, - sizeof(trx1_attr_radio)); - } - break; - case GSM_BTS_TYPE_NANOBTS: - switch (trx->bts->band) { - case GSM_BAND_850: - case GSM_BAND_900: - trx->nominal_power = 20; - break; - case GSM_BAND_1800: - case GSM_BAND_1900: - trx->nominal_power = 23; - break; - default: - LOGP(DNM, LOGL_ERROR, "Unsupported nanoBTS GSM band %s\n", - gsm_band_name(trx->bts->band)); - break; - } - break; - default: - break; + abis_nm_set_radio_attr(trx, trx1_attr_radio, + sizeof(trx1_attr_radio)); } for (i = 0; i < TRX_NR_TS; i++) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34321?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2db92fe448b1f4cd25c1e5c6e1bb9593795c9cb2 Gerrit-Change-Number: 34321 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: abis_nm: separate parsing of osmo-bts features into a function
by fixeria 05 Sep '23

05 Sep '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34322?usp=email ) Change subject: abis_nm: separate parsing of osmo-bts features into a function ...................................................................... abis_nm: separate parsing of osmo-bts features into a function This commit prepares for adding handling of additional attributes. The parse_attr_resp_info_attr() is already quite complex, so take a chance to simplify it a bit. Change-Id: Ia5919a8311cd6a7fc16d02d2196276881e96f4c5 --- M src/osmo-bsc/abis_nm.c 1 file changed, 61 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/22/34322/1 diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 5aaf069..2f49424 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -560,6 +560,46 @@ return ari + num_unreported + 1; /* we have to account for 1st byte with number of unreported attributes */ } + +/* Parse Attribute Response Info content for 3GPP TS 52.021 §9.4.30 Manufacturer Id */ +static void parse_osmo_bts_features(struct gsm_bts *bts, + const uint8_t *data, uint16_t len) +{ + /* log potential BTS feature vector overflow */ + if (len > sizeof(bts->_features_data)) { + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, + "Get Attributes Response: feature vector is truncated " + "(from %u to %zu bytes)\n", len, sizeof(bts->_features_data)); + len = sizeof(bts->_features_data); + } + + /* check that max. expected BTS attribute is above given feature vector length */ + if (len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) { + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, + "Get Attributes Response: reported unexpectedly long (%u bytes) " + "feature vector - most likely it was compiled against newer BSC headers. " + "Consider upgrading your BSC to later version.\n", len); + } + + memcpy(bts->_features_data, data, len); + bts->features_known = true; + + /* Log each BTS feature in the reported vector */ + for (unsigned int i = 0; i < len * 8; i++) { + if (!osmo_bts_has_feature(&bts->features, i)) + continue; + + if (i >= _NUM_BTS_FEAT) { + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, + "Get Attributes Response: unknown feature 0x%02x is supported\n", i); + } else { + LOGPMO(&bts->mo, DNM, LOGL_NOTICE, + "Get Attributes Response: feature '%s' is supported\n", + osmo_bts_features_name(i)); + } + } +} + /* Handle 3GPP TS 52.021 §8.11.3 Get Attribute Response (with nanoBTS specific attribute formatting) */ static int parse_attr_resp_info_attr(struct gsm_bts *bts, const struct gsm_bts_trx *trx, struct abis_om_fom_hdr *foh, struct tlv_parsed *tp) { @@ -572,40 +612,15 @@ char unit_id[40]; struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR]; - /* Parse Attribute Response Info content for 3GPP TS 52.021 §9.4.30 Manufacturer Id */ - if (bts->type == GSM_BTS_TYPE_OSMOBTS && TLVP_PRES_LEN(tp, NM_ATT_MANUF_ID, 2)) { - len = TLVP_LEN(tp, NM_ATT_MANUF_ID); - - /* log potential BTS feature vector overflow */ - if (len > sizeof(bts->_features_data)) { - LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: feature vector is truncated " - "(from %u to %zu bytes)\n", len, sizeof(bts->_features_data)); - len = sizeof(bts->_features_data); + switch (bts->type) { + case GSM_BTS_TYPE_OSMOBTS: + if (TLVP_PRES_LEN(tp, NM_ATT_MANUF_ID, 2)) { + parse_osmo_bts_features(bts, TLVP_VAL(tp, NM_ATT_MANUF_ID), + TLVP_LEN(tp, NM_ATT_MANUF_ID)); } - - /* check that max. expected BTS attribute is above given feature vector length */ - if (len > OSMO_BYTES_FOR_BITS(_NUM_BTS_FEAT)) { - LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: reported unexpectedly long (%u bytes) " - "feature vector - most likely it was compiled against newer BSC headers. " - "Consider upgrading your BSC to later version.\n", len); - } - - memcpy(bts->_features_data, TLVP_VAL(tp, NM_ATT_MANUF_ID), len); - bts->features_known = true; - - /* Log each BTS feature in the reported vector */ - for (i = 0; i < len * 8; i++) { - if (!osmo_bts_has_feature(&bts->features, i)) - continue; - - if (i >= _NUM_BTS_FEAT) - LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: unknown feature 0x%02x is" - " supported\n", i); - else - LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: feature '%s' is" - " supported\n", osmo_bts_features_name(i)); - } - + break; + default: + break; } /* Parse Attribute Response Info content for 3GPP TS 52.021 §9.4.28 Manufacturer Dependent State */ -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34322?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia5919a8311cd6a7fc16d02d2196276881e96f4c5 Gerrit-Change-Number: 34322 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-trx[master]: ms: logging: print category, level, and extended timestamp
by fixeria 05 Sep '23

05 Sep '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-trx/+/34320?usp=email ) Change subject: ms: logging: print category, level, and extended timestamp ...................................................................... ms: logging: print category, level, and extended timestamp Change-Id: I14da3c9e77681268e4f575a6ca7220eedbf2a7a5 Related: osmocom-bb.git Ie3d259f3255d8af80e6780f850b808fa243f97b4 --- M Transceiver52M/ms/ms_upper.cpp 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-trx refs/changes/20/34320/1 diff --git a/Transceiver52M/ms/ms_upper.cpp b/Transceiver52M/ms/ms_upper.cpp index b161f4a..63c222f 100644 --- a/Transceiver52M/ms/ms_upper.cpp +++ b/Transceiver52M/ms/ms_upper.cpp @@ -35,7 +35,9 @@ #include "convolve.h" #include "convert.h" +#include <osmocom/core/application.h> #include <osmocom/gsm/gsm_utils.h> + #include <osmocom/bb/trxcon/trxcon.h> #include <osmocom/bb/trxcon/trxcon_fsm.h> #include <osmocom/bb/trxcon/l1ctl_server.h> @@ -424,6 +426,17 @@ msgb_talloc_ctx_init(tall_trxcon_ctx, 0); trxc_log_init(tall_trxcon_ctx); + /* Configure pretty logging */ + log_set_print_extended_timestamp(osmo_stderr_target, 1); + log_set_print_category_hex(osmo_stderr_target, 0); + log_set_print_category(osmo_stderr_target, 1); + log_set_print_level(osmo_stderr_target, 1); + + log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_BASENAME); + log_set_print_filename_pos(osmo_stderr_target, LOG_FILENAME_POS_LINE_END); + + osmo_fsm_log_timeouts(true); + g_trxcon = trxcon_inst_alloc(tall_trxcon_ctx, 0); g_trxcon->gsmtap = nullptr; g_trxcon->phyif = nullptr; -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/34320?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I14da3c9e77681268e4f575a6ca7220eedbf2a7a5 Gerrit-Change-Number: 34320 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0