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

Change in osmo-bsc[master]: Use libosmocore available API to get value_list
by pespin 08 Aug '22

08 Aug '22

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bsc/+/28978 ) Change subject: Use libosmocore available API to get value_list ...................................................................... Use libosmocore available API to get value_list This API has been available since 1.0.0, and we actually require libosmocore >= 1.7.0 nowadays, so it's totally fine using the libosmocore API and drops the local duplicate. Change-Id: I95c59b31cf1b08e1d513b589ef386d2dd55f09a2 --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/chan_counts.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/handover_decision_2.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/lchan_select.c M src/osmo-bsc/timeslot_fsm.c M src/utils/meas_json.c 15 files changed, 40 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/28978/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I95c59b31cf1b08e1d513b589ef386d2dd55f09a2 Gerrit-Change-Number: 28978 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

Change in osmo-bsc[master]: Use libosmocore available API to get value_list
by pespin 08 Aug '22

08 Aug '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28978 ) Change subject: Use libosmocore available API to get value_list ...................................................................... Use libosmocore available API to get value_list This API has been available since 1.0.0, and we actually require libosmocore >= 1.7.0 nowadays, so it's totally fine using the libosmocore API and drops the local duplicate. Change-Id: I95c59b31cf1b08e1d513b589ef386d2dd55f09a2 --- M include/osmocom/bsc/gsm_data.h M include/osmocom/bsc/lchan_fsm.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/chan_counts.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/handover_decision_2.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/lchan_rtp_fsm.c M src/osmo-bsc/lchan_select.c M src/osmo-bsc/timeslot_fsm.c M src/utils/meas_json.c 15 files changed, 41 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/78/28978/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 126c7a7..7ca7dbe 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -622,7 +622,7 @@ LOGP(ss, level, "%s (ss=%d,%s) (%s) " fmt, \ lchan ? gsm_ts_and_pchan_name(lchan->ts) : "-", \ lchan ? lchan->nr : 0, \ - lchan ? gsm_lchant_name(lchan->type) : "-", \ + lchan ? gsm_chan_t_name(lchan->type) : "-", \ bsc_subscr_name(lchan && lchan->conn ? lchan->conn->bsub : NULL), \ ## args) @@ -1148,7 +1148,7 @@ static inline const char *gsm_pchan_id(enum gsm_phys_chan_config c) { return get_value_string(gsm_pchan_ids, c); } enum gsm_phys_chan_config gsm_pchan_parse(const char *name); -const char *gsm_lchant_name(enum gsm_chan_t c); +const char *gsm_chan_t_name(enum gsm_chan_t c); const char *gsm_chreq_name(enum gsm_chreq_reason_t c); char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); diff --git a/include/osmocom/bsc/lchan_fsm.h b/include/osmocom/bsc/lchan_fsm.h index eb8312e..b9ffb22 100644 --- a/include/osmocom/bsc/lchan_fsm.h +++ b/include/osmocom/bsc/lchan_fsm.h @@ -7,7 +7,7 @@ /* This macro automatically includes a final \n, if omitted. */ #define LOG_LCHAN(lchan, level, fmt, args...) do { \ if ((lchan)->fi) \ - LOGPFSML((lchan)->fi, level, "(type=%s) " fmt, gsm_lchant_name((lchan)->type), ## args); \ + LOGPFSML((lchan)->fi, level, "(type=%s) " fmt, gsm_chan_t_name((lchan)->type), ## args); \ else \ LOGP(DRSL, level, "%s (not initialized) " fmt, gsm_lchan_name(lchan), ## args); \ } while (0) diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 527706a..c650c36 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -439,7 +439,7 @@ default: LOGP(DRSL, LOGL_ERROR, "unsupported activation lchan->type %u %s\n", - lchan->type, gsm_lchant_name(lchan->type)); + lchan->type, gsm_chan_t_name(lchan->type)); return -EINVAL; } @@ -2095,7 +2095,7 @@ if (free_tchf == 0 && free_tchh == 0) { LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: 0x%x Requesting %s reason=call but no TCH available\n", - rqd->ref.ra, gsm_lchant_name(lctype)); + rqd->ref.ra, gsm_chan_t_name(lctype)); return NULL; } @@ -2124,7 +2124,7 @@ LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: 0x%x Requesting %s reason=call but dyn TS switch to " "SDCCH would starve the single available TCH timeslot\n", - rqd->ref.ra, gsm_lchant_name(lctype)); + rqd->ref.ra, gsm_chan_t_name(lctype)); return NULL; } @@ -2187,16 +2187,16 @@ rqd->reason == GSM_CHREQ_REASON_EMERG)) { if (!lchan) { LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD[%s]: no resources for %s 0x%x, retrying with %s\n", - get_value_string(gsm_chreq_descs, rqd->reason), gsm_lchant_name(GSM_LCHAN_SDCCH), - rqd->ref.ra, gsm_lchant_name(GSM_LCHAN_TCH_H)); + get_value_string(gsm_chreq_descs, rqd->reason), gsm_chan_t_name(GSM_LCHAN_SDCCH), + rqd->ref.ra, gsm_chan_t_name(GSM_LCHAN_TCH_H)); lchan = lchan_select_by_type(bts, GSM_LCHAN_TCH_H, SELECT_FOR_MS_CHAN_REQ, NULL); } if (!lchan) { LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD[%s]: no resources for %s 0x%x, retrying with %s\n", - get_value_string(gsm_chreq_descs, rqd->reason), gsm_lchant_name(GSM_LCHAN_SDCCH), - rqd->ref.ra, gsm_lchant_name(GSM_LCHAN_TCH_F)); + get_value_string(gsm_chreq_descs, rqd->reason), gsm_chan_t_name(GSM_LCHAN_SDCCH), + rqd->ref.ra, gsm_chan_t_name(GSM_LCHAN_TCH_F)); lchan = lchan_select_by_type(bts, GSM_LCHAN_TCH_F, SELECT_FOR_MS_CHAN_REQ, NULL); @@ -2204,7 +2204,7 @@ } if (!lchan) { LOG_BTS(bts, DRSL, LOGL_NOTICE, "CHAN RQD[%s]: no resources for %s 0x%x\n", - get_value_string(gsm_chreq_descs, rqd->reason), gsm_lchant_name(lctype), rqd->ref.ra); + get_value_string(gsm_chreq_descs, rqd->reason), gsm_chan_t_name(lctype), rqd->ref.ra); rate_ctr_inc(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_NO_CHANNEL)); rsl_tx_imm_ass_rej(bts, &rqd->ref); llist_del(&rqd->entry); diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 84f8b38..1918252 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -190,7 +190,7 @@ assignment_fail(GSM0808_CAUSE_EQUIPMENT_FAILURE, "Unable to compose Chosen Channel for mode=%s type=%s", get_value_string(gsm48_chan_mode_names, lchan->current_ch_mode_rate.chan_mode), - gsm_lchant_name(lchan->type)); + gsm_chan_t_name(lchan->type)); return; } @@ -597,7 +597,7 @@ "Assignment of lchan %s to %s type %s requested, but lchan is not compatible", gsm_lchan_name(conn->lchan), gsm_lchan_name(req->target_lchan), - gsm_lchant_name(conn->assignment.new_lchan->type)); + gsm_chan_t_name(conn->assignment.new_lchan->type)); return; } } else { diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 13ec8fb..6481957 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -775,7 +775,7 @@ SELECT_FOR_ASSIGNMENT, from_lchan); vty_out(vty, "Error: cannot find free lchan of type %s%s", - gsm_lchant_name(from_lchan->type), VTY_NEWLINE); + gsm_chan_t_name(from_lchan->type), VTY_NEWLINE); } if (reassignment_request_to_lchan(ASSIGN_FOR_VTY, from_lchan, to_lchan, -1, -1)) { vty_out(vty, "Error: not allowed to start assignment for %s%s", @@ -965,13 +965,13 @@ continue; vty_out(vty, "Found unused %s slot: %s%s", - gsm_lchant_name(free_type), gsm_lchan_name(lchan), VTY_NEWLINE); + gsm_chan_t_name(free_type), gsm_lchan_name(lchan), VTY_NEWLINE); lchan_dump_full_vty(vty, lchan); return bts; } } vty_out(vty, "%% Cannot find any BTS (other than BTS %u) with free %s lchan%s", - not_this_bts? not_this_bts->nr : 255, gsm_lchant_name(free_type), VTY_NEWLINE); + not_this_bts? not_this_bts->nr : 255, gsm_chan_t_name(free_type), VTY_NEWLINE); return NULL; } diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index bd13a05..8514435 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -568,7 +568,7 @@ vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u: Type %s%s", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, - lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE); + lchan->nr, gsm_chan_t_name(lchan->type), VTY_NEWLINE); if (lchan->activate.concluded) { vty_out(vty, " Active for: %s seconds%s", @@ -661,7 +661,7 @@ } vty_out(vty, ", Type %s%s TSC-s%dc%u, State %s - L1 MS Power: %u dBm RXL-FULL-dl: %4d dBm RXL-FULL-ul: %4d dBm%s", - gsm_lchant_name(lchan->type), + gsm_chan_t_name(lchan->type), lchan->vamos.enabled ? " (VAMOS)" : "", lchan->tsc_set > 0 ? lchan->tsc_set : 1, lchan->tsc, diff --git a/src/osmo-bsc/chan_counts.c b/src/osmo-bsc/chan_counts.c index 173bda0..a863178 100644 --- a/src/osmo-bsc/chan_counts.c +++ b/src/osmo-bsc/chan_counts.c @@ -101,7 +101,7 @@ OSMO_STRBUF_PRINTF(sb, " %s.%s{", chan_counts_dim1_name[i1], chan_counts_dim2_name[i2]); } - OSMO_STRBUF_PRINTF(sb, " %s=%d", gsm_lchant_name(i3), v); + OSMO_STRBUF_PRINTF(sb, " %s=%d", gsm_chan_t_name(i3), v); } } diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index ad28058..174ff2a 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -235,12 +235,6 @@ return get_string_value(gsm_pchant_names, name); } -/* TODO: move to libosmocore, next to gsm_chan_t_names? */ -const char *gsm_lchant_name(enum gsm_chan_t c) -{ - return get_value_string(gsm_chan_t_names, c); -} - static const struct value_string chreq_names[] = { { GSM_CHREQ_REASON_EMERG, "EMERGENCY" }, { GSM_CHREQ_REASON_PAG, "PAGING" }, diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c index a472089..073e013 100644 --- a/src/osmo-bsc/handover_decision_2.c +++ b/src/osmo-bsc/handover_decision_2.c @@ -53,7 +53,7 @@ lchan->ts->trx->nr, \ lchan->ts->nr, \ lchan->nr, \ - gsm_lchant_name(lchan->type), \ + gsm_chan_t_name(lchan->type), \ gsm48_chan_mode_name(lchan->current_ch_mode_rate.chan_mode), \ bsc_subscr_name(lchan->conn? lchan->conn->bsub : NULL), \ ## args) @@ -64,7 +64,7 @@ lchan->ts->trx->nr, \ lchan->ts->nr, \ lchan->nr, \ - gsm_lchant_name(lchan->type), \ + gsm_chan_t_name(lchan->type), \ gsm48_chan_mode_name(lchan->current_ch_mode_rate.chan_mode), \ new_bts->nr, \ bsc_subscr_name(lchan->conn? lchan->conn->bsub : NULL), \ @@ -76,7 +76,7 @@ lchan->ts->trx->nr, \ lchan->ts->nr, \ lchan->nr, \ - gsm_lchant_name(lchan->type), \ + gsm_chan_t_name(lchan->type), \ gsm48_chan_mode_name(lchan->current_ch_mode_rate.chan_mode), \ gsm0808_cell_id_list_name(remote_cil), \ bsc_subscr_name(lchan->conn? lchan->conn->bsub : NULL), \ @@ -519,7 +519,7 @@ "tch_mode='%s' type='%s' not supported\n", get_value_string(gsm48_chan_mode_names, c->current.lchan->current_ch_mode_rate.chan_mode), - gsm_lchant_name(c->current.lchan->type)); + gsm_chan_t_name(c->current.lchan->type)); break; } if (codec_type_is_supported(c->current.lchan->conn, GSM0808_SCT_HR1)) diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 2f45243..5ba8c17 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -60,7 +60,7 @@ lchan ? lchan->ts->trx->bts->nr : 0, \ lchan ? lchan->ts->trx->nr : 0, \ lchan ? lchan->ts->nr : 0, \ - lchan ? gsm_lchant_name(lchan->type) : "?", \ + lchan ? gsm_chan_t_name(lchan->type) : "?", \ lchan ? lchan->nr : 0, \ lchan ? gsm48_chan_mode_name(lchan->current_ch_mode_rate.chan_mode) : "?" @@ -138,7 +138,7 @@ "("LOG_FMT_FROM_LCHAN") --HO-> ("LOG_FMT_BTS",%s) " LOG_FMT_HO_SCOPE, LOG_ARGS_FROM_LCHAN(conn->lchan), LOG_ARGS_BTS(ho->new_bts), - gsm_lchant_name(ho->new_lchan_type), + gsm_chan_t_name(ho->new_lchan_type), LOG_ARGS_HO_SCOPE(conn)); else snprintf(buf, sizeof(buf), @@ -167,14 +167,14 @@ ho->inter_bsc_in.cell_id_serving_name, ho->inter_bsc_in.cell_id_target_name, LOG_ARGS_BTS(ho->new_bts), - gsm_lchant_name(ho->new_lchan_type), + gsm_chan_t_name(ho->new_lchan_type), LOG_ARGS_HO_SCOPE(conn)); else snprintf(buf, sizeof(buf), "(remote:%s) --HO-> (local:%s,%s) " LOG_FMT_HO_SCOPE, ho->inter_bsc_in.cell_id_serving_name, ho->inter_bsc_in.cell_id_target_name, - gsm_lchant_name(ho->new_lchan_type), + gsm_chan_t_name(ho->new_lchan_type), LOG_ARGS_HO_SCOPE(conn)); } else snprintf(buf, sizeof(buf), LOG_FMT_HO_SCOPE, LOG_ARGS_HO_SCOPE(conn)); @@ -396,7 +396,7 @@ if (!ho->new_lchan) { ho_fail(HO_RESULT_FAIL_NO_CHANNEL, "No %s lchan available on BTS %u", - gsm_lchant_name(ho->new_lchan_type), ho->new_bts->nr); + gsm_chan_t_name(ho->new_lchan_type), ho->new_bts->nr); return; } LOG_HO(conn, LOGL_DEBUG, "Selected lchan %s\n", gsm_lchan_name(ho->new_lchan)); diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 41b7ae7..be3be7b 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -770,7 +770,7 @@ lchan->activate.info.requires_voice_stream ? (use_mgwep_ci ? osmo_mgcpc_ep_ci_name(use_mgwep_ci) : "new") : "none", - gsm_lchant_name(lchan->type), + gsm_chan_t_name(lchan->type), gsm48_chan_mode_name(lchan->activate.ch_mode_rate.chan_mode), lchan->activate.info.encr.alg_a5_n, lchan->activate.info.encr.key_len ? osmo_hexdump_nospc(lchan->activate.info.encr.key, @@ -1309,7 +1309,7 @@ lchan->modify.info.requires_voice_stream ? (use_mgwep_ci ? osmo_mgcpc_ep_ci_name(use_mgwep_ci) : "new") : "none", - gsm_lchant_name(lchan->type), + gsm_chan_t_name(lchan->type), gsm48_chan_mode_name(lchan->modify.ch_mode_rate.chan_mode), lchan->modify.tsc_set, lchan->modify.tsc); diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index e117c65..14d8e07 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -272,7 +272,7 @@ if (val < 0) { lchan_rtp_fail("Cannot determine Abis/IP speech mode for tch_mode=%s type=%s", get_value_string(gsm48_chan_mode_names, lchan->activate.ch_mode_rate.chan_mode), - gsm_lchant_name(lchan->type)); + gsm_chan_t_name(lchan->type)); return; } lchan->abis_ip.speech_mode = val; @@ -281,7 +281,7 @@ if (val < 0) { lchan_rtp_fail("Cannot determine Abis/IP payload type for tch_mode=%s type=%s", get_value_string(gsm48_chan_mode_names, lchan->activate.ch_mode_rate.chan_mode), - gsm_lchant_name(lchan->type)); + gsm_chan_t_name(lchan->type)); return; } lchan->abis_ip.rtp_payload = val; @@ -848,7 +848,7 @@ if (codec < 0) { LOG_LCHAN(lchan, LOGL_ERROR, "Unable to determine MGCP codec type for %s in chan-mode %s\n", - gsm_lchant_name(lchan->type), gsm48_chan_mode_name(lchan->activate.ch_mode_rate.chan_mode)); + gsm_chan_t_name(lchan->type), gsm48_chan_mode_name(lchan->activate.ch_mode_rate.chan_mode)); verb_info->codecs_len = 0; return; } diff --git a/src/osmo-bsc/lchan_select.c b/src/osmo-bsc/lchan_select.c index 0ccdb6a..2388e24 100644 --- a/src/osmo-bsc/lchan_select.c +++ b/src/osmo-bsc/lchan_select.c @@ -101,7 +101,7 @@ if (lchan->fi->state != LCHAN_ST_UNUSED) { LOGPLCHANALLOC("%s ss=%d in type=%s,state=%s not suitable\n", gsm_ts_and_pchan_name(ts), lchan->nr, - gsm_lchant_name(lchan->type), + gsm_chan_t_name(lchan->type), osmo_fsm_inst_state_name(lchan->fi)); continue; } @@ -327,7 +327,7 @@ if (log) { LOG_BTS(bts, DRLL, LOGL_DEBUG, "lchan_avail_by_type(type=%s, reason=%s)\n", - gsm_lchant_name(type), lchan_select_reason_name(reason)); + gsm_chan_t_name(type), lchan_select_reason_name(reason)); } switch (reason) { @@ -422,13 +422,13 @@ struct gsm_lchan *lchan = NULL; LOG_BTS(bts, DRLL, LOGL_DEBUG, "lchan_select_by_type(type=%s, reason=%s)\n", - gsm_lchant_name(type), lchan_select_reason_name(reason)); + gsm_chan_t_name(type), lchan_select_reason_name(reason)); lchan = lchan_avail_by_type(bts, type, reason, ctx, true); if (!lchan) { LOG_BTS(bts, DRLL, LOGL_NOTICE, "Failed to select %s channel (%s)\n", - gsm_lchant_name(type), lchan_select_reason_name(reason)); + gsm_chan_t_name(type), lchan_select_reason_name(reason)); return NULL; } diff --git a/src/osmo-bsc/timeslot_fsm.c b/src/osmo-bsc/timeslot_fsm.c index fbf6c5e..3a25fc9 100644 --- a/src/osmo-bsc/timeslot_fsm.c +++ b/src/osmo-bsc/timeslot_fsm.c @@ -633,7 +633,7 @@ if (!ok && lchan_state_is(lchan, LCHAN_ST_WAIT_TS_READY)) { LOG_TS(ts, LOGL_ERROR, "lchan activation of %s is not permitted for %s (%s)\n", - gsm_lchant_name(lchan->type), gsm_pchan_name(ts->pchan_on_init), + gsm_chan_t_name(lchan->type), gsm_pchan_name(ts->pchan_on_init), gsm_lchan_name(lchan)); lchan_dispatch(lchan, LCHAN_EV_TS_ERROR); } @@ -645,7 +645,7 @@ activating_type = lchan->type; else if (activating_type != lchan->type) { LOG_TS(ts, LOGL_ERROR, "lchan type %s mismatches %s (%s)\n", - gsm_lchant_name(lchan->type), gsm_lchant_name(activating_type), + gsm_chan_t_name(lchan->type), gsm_chan_t_name(activating_type), gsm_lchan_name(lchan)); lchan_dispatch(lchan, LCHAN_EV_TS_ERROR); } @@ -664,7 +664,7 @@ break; default: - LOG_TS(ts, LOGL_ERROR, "cannot use timeslot as %s\n", gsm_lchant_name(activating_type)); + LOG_TS(ts, LOGL_ERROR, "cannot use timeslot as %s\n", gsm_chan_t_name(activating_type)); ts_lchans_dispatch(ts, LCHAN_ST_WAIT_TS_READY, LCHAN_EV_TS_ERROR); break; } diff --git a/src/utils/meas_json.c b/src/utils/meas_json.c index 00b90e8..953b114 100644 --- a/src/utils/meas_json.c +++ b/src/utils/meas_json.c @@ -99,7 +99,7 @@ { printf("\"lchan_type\":\"%s\", \"pchan_type\":\"%s\", " "\"bts_nr\":%d, \"trx_nr\":%d, \"ts_nr\":%d, \"ss_nr\":%d", - gsm_lchant_name(mfm->lchan_type), gsm_pchan_name(mfm->pchan_type), + gsm_chan_t_name(mfm->lchan_type), gsm_pchan_name(mfm->pchan_type), mfm->bts_nr, mfm->trx_nr, mfm->ts_nr, mfm->ss_nr); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28978 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I95c59b31cf1b08e1d513b589ef386d2dd55f09a2 Gerrit-Change-Number: 28978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-pcu[master]: Makefile.am: add 'git-version-gen' to EXTRA_DIST
by fixeria 08 Aug '22

08 Aug '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28968 ) Change subject: Makefile.am: add 'git-version-gen' to EXTRA_DIST ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > To be honest, I don't know. […] Fond a patch explaining why in libosmocore.git: commit ec4f160e2d51c8396f5fafff009fef93a1eeb113 Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: Sun Jul 17 12:13:31 2011 +0200 misc: Put git-version-gen into the tarball autoreconf does not work on released tarballs due the missing git-version-gen. Add it. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbf4bf70d83fbf697d4a094dbb47592deaea6114 Gerrit-Change-Number: 28968 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 12:27:30 +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-pcu[master]: Makefile.am: add 'git-version-gen' to EXTRA_DIST
by fixeria 08 Aug '22

08 Aug '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/28968 ) Change subject: Makefile.am: add 'git-version-gen' to EXTRA_DIST ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Why is that needed? isn't . […] To be honest, I don't know. I saw other osmo-* projects listing it in EXTRA_DIST and updated osmo-pcu for consistency. Now I checked again, and found out that it's not the case for osmo-trx (not generating .version at all), osmo-iuh, osmo-hlr, libsmpp34, libosmo-netif, nor libosmo-abis either. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/28968 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Idbf4bf70d83fbf697d4a094dbb47592deaea6114 Gerrit-Change-Number: 28968 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 12:20:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Build failure of network:osmocom:nightly/neocon in openSUSE_Factory_ARM/aarch64
by OBS Notification 08 Aug '22

08 Aug '22

Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/n… Package network:osmocom:nightly/neocon failed to build in openSUSE_Factory_ARM/aarch64 Check out the package for editing: osc checkout network:osmocom:nightly neocon Last lines of build log: [ 30s] + for s in guess sub [ 30s] ++ find -maxdepth 8 -name config.sub [ 30s] + /usr/bin/make -O -j4 V=1 VERBOSE=1 [ 30s] cc -Wall -g neocon.c -o neocon [ 30s] + RPM_EC=0 [ 30s] ++ jobs -p [ 30s] + exit 0 [ 31s] Executing(%install): /usr/bin/bash -e /var/tmp/rpm-tmp.Ofk8is [ 31s] + umask 022 [ 31s] + cd /home/abuild/rpmbuild/BUILD [ 31s] + /usr/bin/rm -rf /home/abuild/rpmbuild/BUILDROOT/neocon-1.0.2.202208080052-1.2.aarch64 [ 31s] + /usr/bin/mkdir -p /home/abuild/rpmbuild/BUILDROOT [ 31s] + /usr/bin/mkdir /home/abuild/rpmbuild/BUILDROOT/neocon-1.0.2.202208080052-1.2.aarch64 [ 31s] + cd neocon [ 31s] + make install DESTDIR=/home/abuild/rpmbuild/BUILDROOT/neocon-1.0.2.202208080052-1.2.aarch64 DESTDIR=/home/abuild/rpmbuild/BUILDROOT/neocon-1.0.2.202208080052-1.2.aarch64 PREFIX=/usr [ 31s] install -D -m 555 neocon /home/abuild/rpmbuild/BUILDROOT/neocon-1.0.2.202208080052-1.2.aarch64/usr/bin/neocon [ 31s] + /usr/lib/rpm/find-debuginfo -j4 --build-id-seed 1.0.2.202208080052-1.2 --unique-debug-suffix -1.0.2.202208080052-1.2.aarch64 --unique-debug-src-base neocon-1.0.2.202208080052-1.2.aarch64 --run-dwz --dwz-low-mem-die-limit 10000000 --dwz-max-die-limit 50000000 -S debugsourcefiles.list /home/abuild/rpmbuild/BUILD/neocon [ 31s] /var/tmp/rpm-tmp.Ofk8is: line 38: /usr/lib/rpm/find-debuginfo: No such file or directory [ 31s] error: Bad exit status from /var/tmp/rpm-tmp.Ofk8is (%install) [ 31s] [ 31s] RPM build errors: [ 31s] Bad exit status from /var/tmp/rpm-tmp.Ofk8is (%install) [ 31s] ### VM INTERACTION START ### [ 31s] [ 22.588100][ T1] sysrq: Power Off [ 31s] [ 22.589345][ T6] reboot: Power down [ 31s] ### VM INTERACTION END ### [ 31s] [ 31s] obs-arm-8 failed "build neocon.spec" at Mon Aug 8 12:18:59 UTC 2022. [ 31s] -- Configure notifications at https://build.opensuse.org/my/subscriptions openSUSE Build Service (https://build.opensuse.org/)

1 0

Change in libosmocore[master]: gsm: Add BTS feature for Osmux
by fixeria 08 Aug '22

08 Aug '22

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28977 ) Change subject: gsm: Add BTS feature for Osmux ...................................................................... Patch Set 2: Code-Review+1 (2 comments) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/28977/comment/dfc391c8_95164406 PS1, Line 9: is > it is used when implemented, atemporarly. […] I asked because I was confused: it reads as if Osmux was already implemented in osmo-bts. At the same time I remember that it is not. I always had difficulties understanding English tenses... In any case, not critical. File src/gsm/bts_features.c: https://gerrit.osmocom.org/c/libosmocore/+/28977/comment/eca671ce_df0e7e0f PS1, Line 46: "}, > consistency: missing space Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie79bfb6d0a7a8fe2842d2596b3244e7b74a0d5b6 Gerrit-Change-Number: 28977 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 12:09:43 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes 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 libosmocore[master]: gsm: Add BTS feature for Osmux
by pespin 08 Aug '22

08 Aug '22

Attention is currently required from: fixeria. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/28977 to look at the new patch set (#2). Change subject: gsm: Add BTS feature for Osmux ...................................................................... gsm: Add BTS feature for Osmux This feature is used by the BTS to signal to the BSC that it supports using Osmux instead of RTP on the BTS<->BSC(MGW) data plane. Related: SYS#5987 Change-Id: Ie79bfb6d0a7a8fe2842d2596b3244e7b74a0d5b6 --- M include/osmocom/gsm/bts_features.h M src/gsm/bts_features.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/77/28977/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie79bfb6d0a7a8fe2842d2596b3244e7b74a0d5b6 Gerrit-Change-Number: 28977 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in libosmocore[master]: gsm: Add BTS feature for Osmux
by pespin 08 Aug '22

08 Aug '22

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28977 ) Change subject: gsm: Add BTS feature for Osmux ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/28977/comment/967e4900_aa5871fe PS1, Line 9: is > "is going to be" or "will be" I guess? it is used when implemented, atemporarly. No need to become picky and philosophical ;) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28977 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie79bfb6d0a7a8fe2842d2596b3244e7b74a0d5b6 Gerrit-Change-Number: 28977 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 12:00:52 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-cbc[master]: Bump version: 0.3.0.93-65d3 → 0.4.0
by pespin 08 Aug '22

08 Aug '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28975 ) Change subject: Bump version: 0.3.0.93-65d3 → 0.4.0 ...................................................................... Bump version: 0.3.0.93-65d3 → 0.4.0 Change-Id: I8a7e8830dba3193419e4854588a98d1572747344 --- M debian/changelog 1 file changed, 103 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index cc5f8c0..a982e29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,106 @@ +osmo-cbc (0.4.0) unstable; urgency=medium + + [ Pau Espin Pedrol ] + * Configure libosmocore logging system as multithread + * Move peer to DELETED state before signalling parent FSM with DELETE_(N)ACK + * Fix typos in error messages + * main: remove newline char in perror() call + * cbsp_server: Exit process gracefully if binding socket fails + * Move header files to include/osmocom/cbc/ dir + * Improve error handling when forwarding ECBE msg to CBSP + * cbsp: Clean up conn closed paths + * rest_api: Fix cbs.data_user_len not set in 'payload_encoded' + * Add sbcap library + * Add unit tests for sbcap + * sbcap: Update asn1c skeleton files + * Add initial SBc-AP support to osmo-cbc + * doc: user manual: fix typo + * doc: Document SBc-AP support and config + * Fix printf format in 32bit arch + * vty: Fix call to OSMO_STRBUF_PRINTF + * sbcap: Update asn1c skeleton files + * Improve example osmo-cbc.cfg file + * sbcap_server.c: Remove unneeded goto + * sbcap_server: Log all sctp notif + * sbcap_server: Fix double-free of rx msg if conn is destroyed + * Split cbc_peer to its own .c and .h files + * cbc_peer: Close SBcAP conn when removing active peer + * Move function defined in rest_it_op.c to rest_it_op.h + * Move vty stuff to its own header cbc_vty.h + * Split cbc_message related code to its own .c and .h file + * Get rid of internal.h + * sbcap_server.h: Remove unused fields + * cbsp_server.c: Drop unused code + * Rename CBSP,SABP,SBcAP structs and APIs + * Rename {cbsp,sbcap}_server(_fsm).h s/server/link/ + * Rename fields in cbc_{cbsp,sbcap}_mgr + * Use cbc_{cbsp,sbcap}_link_close when possible + * cbc_vty: Use value_string to define proto names used in vty + * cbc_vty: print correct protocol when writing config + * Refactor {cbsp,sbcap}_cbc_accept_cb + * cbc_vty: write peer config nodes at the end + * Make cbsp,sbcap mgr available in data model + * Fix cbc_vty_go_parent() not being called + * cbc_main: Fix setting default SBc-AP local address + * vty: Define peer proto during 'peer' node cmd + * Move struct cbc bring up code to its own file and functions + * Split cbsp/sbcap server socket creation from struct allocation + * cbc-apitool: Fix port stored in var as a string + * cbc-apitool: print usage instead of crashing if no subcmd passed + * sbcap: Fix encoding of Warning-Type + * cosmetic: smscb_message_fsm.c: Fix typo in comment + * Support CBSP/TCP and SBc-AP/SCTP client mode + * cbc_vty: Fix missing indent char in dump_one_etws_msg + * vty: Fix 'show message' not finding expired messages + * vty: Add command to delete expired messages + * vty: Print created and expired times for each message + * sbcap_msg: Improve spec references for used IEs + * vty: Fix typo in vty output + * Rearrange cbc_message and cbsp message code + * Rename functions generating CBSP/SBc-AP Write-Replace request + * sbcap: Fix typo in sbcap_cause_vals + * sbcap: Send Error Indication if decoding rx msg fails + * sbcap: Drop unused events + * sbcap: Improve logging of rx Error Indication + * sbcap: Improve logging on non-implemented PWS Restart/Failure Ind + * sbcap: Tx Error ind if Rx ProcedureCode is unknown + * Move sbcap_as_find_ie() to libsbcap + * sbcap: Fix typo in comment + * sbcap: Log info about messages received and trasmitted + * Move cbc_cell_id2str() and make it public + * Move ASN1C enc/dec logging to its own category + * sbcap: Request and handle Write Replace Warning Indication + * sbcap: Store reported failed TAIs from WriteReplaceResponse in cbc_message_peer + * sbcap: Improve handling of WriteReplaceWarnResponse + * Introduce logging category smscb + * Split event list for smscb_message_fsm and smscb_peer_fsm + * Split smscb_peer_fsm into CBSP and SBcAP specific FSMs + * cbc_main: Enable logging of fsm timeouts + * Propagate error to caller when tx cbsp/sbcap Write-Replace-Req fails + * sbcap: Fix NULL pointer dereference + * cbsp/sbcap: Fix memleak in error condition (tx without link) + * *_smscb_peer_fsm: Immediately NACK if Tx of msg failed + * cbsp: Fix heap-use-after-free closing cli conn in connecting state + * cbsp/sbcap: Set link fsm id with peer's name + * cbsp/sbcap: Fail if trying to Tx on non-connected (connecting) link + * sbcap: Add Concurrent-Warning-Message-Indicator IE to Write-Replace-Req + * cbsp: Log storing of CellId info received from peers + * cbsp: Store content of received Cell Id from Failed List + + [ Oliver Smith ] + * gitreview: add new file + * checkpatch.conf: ignore sbcap generated files + * contrib/osmo-cbc.spec: add libosmo-sbcap0/-dev + * debian: add subpackages libosmo-sbcap0/-dev + * libosmo-sbcap.pc.in: new file + + [ Vadim Yanitskiy ] + * tests/sbcap: fix wrong operator used in OSMO_ASSERT statement + * cbc_vty: use install_element[_ve](), not install_lib_element[_ve]() + * libosmo-sbcap: add -no-undefined to libosmo_sbcap_la_LDFLAGS + + -- Pau Espin Pedrol <pespin(a)sysmocom.de> Mon, 08 Aug 2022 11:42:56 +0200 + osmo-cbc (0.3.0) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I8a7e8830dba3193419e4854588a98d1572747344 Gerrit-Change-Number: 28975 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-cbc[master]: Bump version: 0.3.0.93-65d3 → 0.4.0
by pespin 08 Aug '22

08 Aug '22

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28975 ) Change subject: Bump version: 0.3.0.93-65d3 → 0.4.0 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28975 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I8a7e8830dba3193419e4854588a98d1572747344 Gerrit-Change-Number: 28975 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 08 Aug 2022 11:58:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2025

2024

2023

2022

gerrit-log August 2022