From 3ec78f0d49513b78a0fca5a6861f34f638c4b5bf Mon Sep 17 00:00:00 2001 From: Alexander Chemeris Date: Sat, 30 May 2015 14:40:54 -0400 Subject: libbsc: Abstract out SIs update/generation for a BTS into a separate function. The code to do that doesn't belong to the control interface, so abstract it out to a separate function gsm_bts_set_system_infos(). --- openbsc/src/libbsc/bsc_ctrl_commands.c | 18 +++++------------- openbsc/src/libbsc/bsc_init.c | 23 ++++++++++++++++++++++- 2 files changed, 27 insertions(+), 14 deletions(-) (limited to 'openbsc/src') diff --git a/openbsc/src/libbsc/bsc_ctrl_commands.c b/openbsc/src/libbsc/bsc_ctrl_commands.c index 1d91c5fc2..b6b1c9a8b 100644 --- a/openbsc/src/libbsc/bsc_ctrl_commands.c +++ b/openbsc/src/libbsc/bsc_ctrl_commands.c @@ -202,20 +202,12 @@ static int get_bts_si(struct ctrl_cmd *cmd, void *data) static int set_bts_si(struct ctrl_cmd *cmd, void *data) { struct gsm_bts *bts = cmd->node; - struct gsm_bts_trx *trx; + int rc; - /* Generate a new ID */ - bts->bcch_change_mark += 1; - bts->bcch_change_mark %= 0x7; - - llist_for_each_entry(trx, &bts->trx_list, list) { - int rc; - - rc = gsm_bts_trx_set_system_infos(trx); - if (rc != 0) { - cmd->reply = "Failed to generate SI"; - return CTRL_CMD_ERROR; - } + rc = gsm_bts_set_system_infos(bts); + if (rc != 0) { + cmd->reply = "Failed to generate SI"; + return CTRL_CMD_ERROR; } cmd->reply = "Generated new System Information"; diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index dfe27976f..719e19d23 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -120,7 +120,7 @@ static int rsl_si(struct gsm_bts_trx *trx, enum osmo_sysinfo_type i, int si_len) return rc; } -/* set all system information types */ +/* set all system information types for a TRX */ int gsm_bts_trx_set_system_infos(struct gsm_bts_trx *trx) { int i, rc; @@ -197,6 +197,27 @@ err_out: return rc; } +/* set all system information types for a BTS */ +int gsm_bts_set_system_infos(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx; + + /* Generate a new ID */ + bts->bcch_change_mark += 1; + bts->bcch_change_mark %= 0x7; + + llist_for_each_entry(trx, &bts->trx_list, list) { + int rc; + + rc = gsm_bts_trx_set_system_infos(trx); + if (rc != 0) { + return rc; + } + } + + return 0; +} + /* Produce a MA as specified in 10.5.2.21 */ static int generate_ma_for_ts(struct gsm_bts_trx_ts *ts) { -- cgit v1.2.3