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

[M] Change in osmo-bsc[master]: cosmetic: Rename is_ipaccess_bts() to is_ipa_abisip_bts()

by fixeria

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32179 ) Change subject: cosmetic: Rename is_ipaccess_bts() to is_ipa_abisip_bts() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32179 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I202c58341c1536489064d2671c0842c6f70b5429 Gerrit-Change-Number: 32179 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 08 May 2023 06:57:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: allocate primitives of fixed size (64 + 64)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32628 ) Change subject: trxcon/l1sched: allocate primitives of fixed size (64 + 64) ...................................................................... trxcon/l1sched: allocate primitives of fixed size (64 + 64) When running trxcon with GSMTAP Um logging enabled (-g cmd line arg), in handle_prim_rach_cnf() we msgb_put() one or two bytes to the given msgb. This causes a segfault, because the L1SCHED_PRIM_T_RACH prims have 0 tailroom bytes available. While we could allocate L1SCHED_PRIM_T_RACH with a few extra bytes, a more fundamental approach is to allocate all l1sched primitives with a fixed tailroom. Change-Id: Ica87b147e11744a69dcd7c056376dcf6b98f9ca6 Fixes: ff9db9de "trxcon/l1sched: rework the primitive API" Related: OS#5500 --- M src/host/trxcon/include/osmocom/bb/l1sched/prim.h M src/host/trxcon/src/sched_lchan_sch.c M src/host/trxcon/src/sched_prim.c M src/host/trxcon/src/sched_trx.c M src/host/trxcon/src/trxcon_fsm.c 5 files changed, 33 insertions(+), 14 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/host/trxcon/include/osmocom/bb/l1sched/prim.h b/src/host/trxcon/include/osmocom/bb/l1sched/prim.h index 0981dc9..0575ad8 100644 --- a/src/host/trxcon/include/osmocom/bb/l1sched/prim.h +++ b/src/host/trxcon/include/osmocom/bb/l1sched/prim.h @@ -114,8 +114,7 @@ enum osmo_prim_operation op); struct msgb *l1sched_prim_alloc(enum l1sched_prim_type type, - enum osmo_prim_operation op, - size_t extra_size); + enum osmo_prim_operation op); struct msgb *l1sched_lchan_prim_dequeue(struct l1sched_lchan_state *lchan, uint32_t fn); void l1sched_lchan_prim_assign_dummy(struct l1sched_lchan_state *lchan); diff --git a/src/host/trxcon/src/sched_lchan_sch.c b/src/host/trxcon/src/sched_lchan_sch.c index f433de6..e242005 100644 --- a/src/host/trxcon/src/sched_lchan_sch.c +++ b/src/host/trxcon/src/sched_lchan_sch.c @@ -66,7 +66,7 @@ struct l1sched_prim *prim; struct msgb *msg; - msg = l1sched_prim_alloc(L1SCHED_PRIM_T_SCH, PRIM_OP_INDICATION, 0); + msg = l1sched_prim_alloc(L1SCHED_PRIM_T_SCH, PRIM_OP_INDICATION); OSMO_ASSERT(msg != NULL); prim = l1sched_prim_from_msgb(msg); diff --git a/src/host/trxcon/src/sched_prim.c b/src/host/trxcon/src/sched_prim.c index 5f0ee29..380d5a8 100644 --- a/src/host/trxcon/src/sched_prim.c +++ b/src/host/trxcon/src/sched_prim.c @@ -35,7 +35,8 @@ #include <osmocom/bb/l1sched/l1sched.h> #include <osmocom/bb/l1sched/logging.h> -#define L1SCHED_PRIM_HEADROOM 128 +#define L1SCHED_PRIM_HEADROOM 64 +#define L1SCHED_PRIM_TAILROOM 64 osmo_static_assert(sizeof(struct l1sched_prim) <= L1SCHED_PRIM_HEADROOM, l1sched_prim_size); @@ -61,12 +62,11 @@ } struct msgb *l1sched_prim_alloc(enum l1sched_prim_type type, - enum osmo_prim_operation op, - size_t extra_size) + enum osmo_prim_operation op) { struct msgb *msg; - msg = msgb_alloc_headroom(L1SCHED_PRIM_HEADROOM + extra_size, + msg = msgb_alloc_headroom(L1SCHED_PRIM_HEADROOM + L1SCHED_PRIM_TAILROOM, L1SCHED_PRIM_HEADROOM, "l1sched_prim"); if (msg == NULL) return NULL; @@ -89,7 +89,7 @@ bool cached; /* Allocate a new primitive */ - msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST, GSM_MACBLOCK_LEN); + msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST); OSMO_ASSERT(msg != NULL); prim = l1sched_prim_from_msgb(msg); @@ -469,7 +469,7 @@ if (!prim_len) return; - msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST, prim_len); + msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST); OSMO_ASSERT(msg != NULL); prim = l1sched_prim_from_msgb(msg); @@ -498,7 +498,7 @@ lchan_desc = &l1sched_lchan_desc[lchan->type]; - msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_INDICATION, data_len); + msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_INDICATION); OSMO_ASSERT(msg != NULL); prim = l1sched_prim_from_msgb(msg); diff --git a/src/host/trxcon/src/sched_trx.c b/src/host/trxcon/src/sched_trx.c index bcd24f0..ccac32c 100644 --- a/src/host/trxcon/src/sched_trx.c +++ b/src/host/trxcon/src/sched_trx.c @@ -74,7 +74,7 @@ struct l1sched_prim *prim; struct msgb *msg; - msg = l1sched_prim_alloc(L1SCHED_PRIM_T_PCHAN_COMB, PRIM_OP_INDICATION, 0); + msg = l1sched_prim_alloc(L1SCHED_PRIM_T_PCHAN_COMB, PRIM_OP_INDICATION); OSMO_ASSERT(msg != NULL); prim = l1sched_prim_from_msgb(msg); diff --git a/src/host/trxcon/src/trxcon_fsm.c b/src/host/trxcon/src/trxcon_fsm.c index 598f2bd..eabab3d 100644 --- a/src/host/trxcon/src/trxcon_fsm.c +++ b/src/host/trxcon/src/trxcon_fsm.c @@ -286,7 +286,7 @@ struct l1sched_prim *prim; struct msgb *msg; - msg = l1sched_prim_alloc(L1SCHED_PRIM_T_RACH, PRIM_OP_REQUEST, 0); + msg = l1sched_prim_alloc(L1SCHED_PRIM_T_RACH, PRIM_OP_REQUEST); OSMO_ASSERT(msg != NULL); prim = l1sched_prim_from_msgb(msg); @@ -492,7 +492,7 @@ struct l1sched_prim *prim; struct msgb *msg; - msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST, req->data_len); + msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST); OSMO_ASSERT(msg != NULL); prim = l1sched_prim_from_msgb(msg); @@ -563,7 +563,7 @@ if (l1gprs_handle_ul_block_req(trxcon->gprs, &block_req, msg) != 0) return; - msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST, block_req.data_len); + msg = l1sched_prim_alloc(L1SCHED_PRIM_T_DATA, PRIM_OP_REQUEST); OSMO_ASSERT(msg != NULL); prim = l1sched_prim_from_msgb(msg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica87b147e11744a69dcd7c056376dcf6b98f9ca6 Gerrit-Change-Number: 32628 Gerrit-PatchSet: 2 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in osmo-bsc[master]: Support (optional) indication of NCH position in SI1 rest octets

by laforge

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, jolly, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/32655 to look at the new patch set (#2). Change subject: Support (optional) indication of NCH position in SI1 rest octets ...................................................................... Support (optional) indication of NCH position in SI1 rest octets This adds the vty commands and respective logic to allow the user to specify the NCH (notification channel) position in the SI1 rests octets. Change-Id: Iefde0af44a663f22462a54d68a58caa560eceb2f Related: OS#5781 Requires: libosmocore.git I24a0095ac6eee0197f9d9ef9895c7795df6cdc49 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts_vty.c M src/osmo-bsc/osmo_bsc_main.c M src/osmo-bsc/system_information.c 4 files changed, 91 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/32655/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefde0af44a663f22462a54d68a58caa560eceb2f Gerrit-Change-Number: 32655 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: timeslot_fsm: Avoid error messages about TS_EV_OML_READY not permitted

by laforge

laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32071 ) Change subject: timeslot_fsm: Avoid error messages about TS_EV_OML_READY not permitted ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32071 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idd1f541d66abbf2a1d136df42a6fe277eeb9482d Gerrit-Change-Number: 32071 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: nanobts: Request "supported features" attribute from BTS and BB_TRANSC

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32652 ) Change subject: nanobts: Request "supported features" attribute from BTS and BB_TRANSC ...................................................................... nanobts: Request "supported features" attribute from BTS and BB_TRANSC The nanoBTS feature reporting works significantly different from what osmo-bts implements. They have a "Supported Features" IE in potentially each of their MOs, and within this have nested IEs expressing respective feature sets. Let's start by requesting those for at least those MOs where we already implement a GET ATTRIBUTES call in the FSM. Change-Id: I15116044fb354ec0a0682c62078fbfa907b318f3 --- M src/osmo-bsc/nm_bb_transc_fsm.c M src/osmo-bsc/nm_bts_fsm.c 2 files changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/52/32652/1 diff --git a/src/osmo-bsc/nm_bb_transc_fsm.c b/src/osmo-bsc/nm_bb_transc_fsm.c index 3302918..e430534 100644 --- a/src/osmo-bsc/nm_bb_transc_fsm.c +++ b/src/osmo-bsc/nm_bb_transc_fsm.c @@ -113,7 +113,7 @@ if (!bb_transc->mo.get_attr_sent && !bb_transc->mo.get_attr_rep_received) { bb_transc->mo.get_attr_sent = true; /* N. B: we rely on attribute order when parsing response in abis_nm_rx_get_attr_resp() */ - const uint8_t trx_attr[] = { NM_ATT_MANUF_STATE, NM_ATT_SW_CONFIG, }; + const uint8_t trx_attr[] = { NM_ATT_MANUF_STATE, NM_ATT_SW_CONFIG, NM_ATT_IPACC_SUPP_FEATURES }; /* we should not request more attributes than we're ready to handle */ OSMO_ASSERT(sizeof(trx_attr) < MAX_BTS_ATTR); abis_nm_get_attr(trx->bts, NM_OC_BASEB_TRANSC, 0, trx->nr, 0xff, diff --git a/src/osmo-bsc/nm_bts_fsm.c b/src/osmo-bsc/nm_bts_fsm.c index ea9fa5c..6460522 100644 --- a/src/osmo-bsc/nm_bts_fsm.c +++ b/src/osmo-bsc/nm_bts_fsm.c @@ -100,7 +100,7 @@ if (!bts->mo.get_attr_sent && !bts->mo.get_attr_rep_received) { bts->mo.get_attr_sent = true; /* N. B: we rely on attribute order when parsing response in abis_nm_rx_get_attr_resp() */ - const uint8_t bts_attr[] = { NM_ATT_MANUF_ID, NM_ATT_SW_CONFIG, }; + const uint8_t bts_attr[] = { NM_ATT_MANUF_ID, NM_ATT_SW_CONFIG, NM_ATT_IPACC_SUPP_FEATURES}; /* we should not request more attributes than we're ready to handle */ OSMO_ASSERT(sizeof(bts_attr) < MAX_BTS_ATTR); abis_nm_get_attr(bts, NM_OC_BTS, 0, 0xff, 0xff, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32652 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I15116044fb354ec0a0682c62078fbfa907b318f3 Gerrit-Change-Number: 32652 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: nanoBTS: print [supported] versions of MOs

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32653 ) Change subject: nanoBTS: print [supported] versions of MOs ...................................................................... nanoBTS: print [supported] versions of MOs ip.access has the concept of MO versions. We've always received that information, but never used it in any way. Start by logging it. The first byte is the default version, the other bytes describe the optional other versions supported by the BTS. One could switch to such an alternate version by a Set Attributes before OPSTART. Change-Id: I9aefcae31dc9139e90161b4690e77d4958021d45 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 33 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/53/32653/1 diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 8669d64..21e9c1c 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -195,12 +195,29 @@ /* Callback function to be called every time we receive a 12.21 SW activated report */ static int sw_activ_rep(struct msgb *mb) { + struct abis_om_hdr *oh = msgb_l2(mb); struct abis_om_fom_hdr *foh = msgb_l3(mb); struct e1inp_sign_link *sign_link = mb->dst; struct gsm_bts *bts = sign_link->trx->bts; struct gsm_bts_trx *trx; struct gsm_gprs_nsvc *nsvc; struct gsm_bts_trx_ts *ts; + struct tlv_parsed tp; + + /* we don't care about the results. Even in erroneous cases, the 'tp' is zero-initialised */ + abis_nm_tlv_parse(&tp, bts, foh->data, oh->length - sizeof(*foh)); + + if (TLVP_PRES_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION, 1)) { + const uint8_t *versions = TLVP_VAL(&tp, NM_ATT_IPACC_OBJ_VERSION); + char buf[256]; + struct osmo_strbuf sb = { .buf = buf, .len = sizeof(buf) }; + unsigned int i; + + for (i = 0; i < TLVP_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION); i++) + OSMO_STRBUF_APPEND(sb, snprintf, "%u ", versions[i]); + + LOGPFOH(DNM, LOGL_INFO, foh, "Object Versions supported: %s\n", buf); + } if (!is_ipa_abisip_bts(bts)) return 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9aefcae31dc9139e90161b4690e77d4958021d45 Gerrit-Change-Number: 32653 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in osmo-bsc[master]: Support (optional) indication of NCH position in SI1 rest octets

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32655 ) Change subject: Support (optional) indication of NCH position in SI1 rest octets ...................................................................... Support (optional) indication of NCH position in SI1 rest octets This adds the vty commands and respective logic to allow the user to specify the NCH (notification channel) position in the SI1 rests octets. Change-Id: Iefde0af44a663f22462a54d68a58caa560eceb2f Related: OS#5781 Requires: libosmocore.git I24a0095ac6eee0197f9d9ef9895c7795df6cdc49 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts_vty.c M src/osmo-bsc/system_information.c 3 files changed, 81 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/55/32655/1 diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index d6bf758..a2b84c6 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -568,6 +568,11 @@ uint16_t scramble_list[MAX_EARFCN_LIST]; } data; } si_common; + /* NCH (Notification Channel) related parameters */ + struct { + uint8_t num_blocks; /* NCH number of CCCH blocks (0 = no NCH) */ + uint8_t first_block; /* NCH first block number */ + } nch; bool early_classmark_allowed; bool early_classmark_allowed_3g; /* for testing only: Have an infinitely long radio link timeout */ diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index e37cfd4..547e7ef 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -1107,6 +1107,47 @@ return CMD_SUCCESS; } +DEFUN_USRATTR(cfg_bts_nch_position, + cfg_bts_nch_position_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "nch-position num-blocks <1-7> first-block <0-6>", + "NCH (Notification Channel) position within CCCH" + "Number of blocks reserved for NCH\n" + "First block reserved for NCH\n") +{ + struct gsm_bts *bts = vty->index; + int num_blocks = atoi(argv[0]); + int first_block = atoi(argv[1]); + + if (osmo_gsm48_si1ro_nch_pos_encode(num_blocks, first_block)) { + vty_out(vty, "num-blocks %u first-block %u is not permitted by 3GPP TS 44.010 Table 10.5.2.32.1b%s", + num_blocks, first_block, VTY_NEWLINE); + return CMD_WARNING; + } + + /* TODO: when to check MAX_AG_BLKS_RES must be >= NUM_BLOCKS here? */ + /* TODO: when to check for combined CCCH constraints? */ + + bts->nch.num_blocks = num_blocks; + bts->nch.first_block = first_block; + + return CMD_SUCCESS; +} + +DEFUN_USRATTR(cfg_bts_no_nch_position, + cfg_bts_no_nch_position_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), + "no nch-position", + NO_STR "Disable NCH in this BTS\n") +{ + struct gsm_bts *bts = vty->index; + + bts->nch.num_blocks = 0; + bts->nch.first_block = 0; + + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_bts_cell_barred, cfg_bts_cell_barred_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK), @@ -4405,6 +4446,12 @@ bts->si_common.chan_desc.bs_pa_mfrms + 2, VTY_NEWLINE); vty_out(vty, " channel-description bs-ag-blks-res %u%s", bts->si_common.chan_desc.bs_ag_blks_res, VTY_NEWLINE); + if (bts->nch.num_blocks) { + vty_out(vty, " nch-position num-blocks %u first-block %u%s", + bts->nch.num_blocks, bts->nch.first_block, VTY_NEWLINE); + } else { + vty_out(vty, " no nch-position%s", VTY_NEWLINE); + } if (bts->ccch_load_ind_thresh != 10) vty_out(vty, " ccch load-indication-threshold %u%s", @@ -4851,6 +4898,8 @@ install_element(BTS_NODE, &cfg_bts_interf_meas_level_bounds_cmd); install_element(BTS_NODE, &cfg_bts_srvcc_fast_return_cmd); install_element(BTS_NODE, &cfg_bts_immediate_assignment_cmd); + install_element(BTS_NODE, &cfg_bts_nch_position_cmd); + install_element(BTS_NODE, &cfg_bts_no_nch_position_cmd); neighbor_ident_vty_init(); /* See also handover commands added on bts level from handover_vty.c */ diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index 6e82c56..35fce68 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -771,7 +771,19 @@ * SI1 Rest Octets (10.5.2.32), contains NCH position and band * indicator but that is not in the 04.08. */ - rc = osmo_gsm48_rest_octets_si1_encode(si1->rest_octets, NULL, is_dcs_net(bts)); + if (bts->nch.num_blocks) { + rc = osmo_gsm48_si1ro_nch_pos_encode(bts->nch.num_blocks, bts->nch.first_block); + if (rc < 0) { + LOGP(DRR, LOGL_ERROR, "Unable to encode NCH position (num_blocks=%u, first_block=%u)\n", + bts->nch.num_blocks, bts->nch.first_block); + rc = osmo_gsm48_rest_octets_si1_encode(si1->rest_octets, NULL, is_dcs_net(bts)); + } else { + uint8_t nch_pos = rc; + rc = osmo_gsm48_rest_octets_si1_encode(si1->rest_octets, &nch_pos, is_dcs_net(bts)); + } + } else { + rc = osmo_gsm48_rest_octets_si1_encode(si1->rest_octets, NULL, is_dcs_net(bts)); + } return sizeof(*si1) + rc; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32655 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iefde0af44a663f22462a54d68a58caa560eceb2f Gerrit-Change-Number: 32655 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-def...

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32654 ) Change subject: Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ...................................................................... Add -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition ... if --enable-werror is used Change-Id: Ifa99336e5d88db214054c6d4b26cc96d00f5ca99 --- M configure.ac 1 file changed, 12 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/32654/1 diff --git a/configure.ac b/configure.ac index ebcb839..df1aacb 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,7 @@ then WERROR_FLAGS="-Werror" WERROR_FLAGS+=" -Wno-error=deprecated -Wno-error=deprecated-declarations" + WERROR_FLAGS+=" -Werror=implicit-int -Werror=int-conversion -Werror=old-style-definition" WERROR_FLAGS+=" -Wno-error=cpp" # "#warning" CFLAGS="$CFLAGS $WERROR_FLAGS" CPPFLAGS="$CPPFLAGS $WERROR_FLAGS" -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32654 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ifa99336e5d88db214054c6d4b26cc96d00f5ca99 Gerrit-Change-Number: 32654 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[M] Change in libosmocore[master]: Add osmo_gsm48_si1ro_nch_pos_{encode,decode} functions

by laforge

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/32650 to look at the new patch set (#2). Change subject: Add osmo_gsm48_si1ro_nch_pos_{encode,decode} functions ...................................................................... Add osmo_gsm48_si1ro_nch_pos_{encode,decode} functions These functions encode/decode the NCH position field within the SI1 rest octets. This is used within ASCI (VBS/VGCS). Change-Id: I24a0095ac6eee0197f9d9ef9895c7795df6cdc49 Related: OS#5781 --- M include/osmocom/gsm/gsm48_rest_octets.h M src/gsm/gsm48_rest_octets.c M src/gsm/libosmogsm.map 3 files changed, 94 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/50/32650/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32650 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I24a0095ac6eee0197f9d9ef9895c7795df6cdc49 Gerrit-Change-Number: 32650 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: trxcon/l1sched: allocate primitives of fixed size (64 + 64)

by laforge

Attention is currently required from: osmith, fixeria, msuraev. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32628 ) Change subject: trxcon/l1sched: allocate primitives of fixed size (64 + 64) ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32628 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ica87b147e11744a69dcd7c056376dcf6b98f9ca6 Gerrit-Change-Number: 32628 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 May 2023 04:41:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023