diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-08-15 15:53:00 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-03-16 11:56:10 +0100 |
| commit | 8ec4952557f9b4fff3792c3a57e6cf660fcf39e8 (patch) | |
| tree | 7044b1fb00052ca6ae9248a3db47c17d429b2fe5 /openbsc/src/osmo-bsc/osmo_bsc_main.c | |
| parent | 4d31900e2dec112cad159475bcdb4cdbe734213c (diff) | |
bsc: Create a osmo_bsc_data and embed osmo_msc_data
We want to have multiple MSCs but we also have some data
that is only present on a per BSC basis. Right now the
MSC data is not allocated with talloc, so we have some
change in the talloc contexts.
Diffstat (limited to 'openbsc/src/osmo-bsc/osmo_bsc_main.c')
| -rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index 1fe43d57b..02b68d39f 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -161,13 +161,13 @@ static void signal_handler(int signal) talloc_report_full(tall_bsc_ctx, stderr); break; case SIGUSR2: - if (!bsc_gsmnet->msc_data) + if (!bsc_gsmnet->bsc_data) return; - if (!bsc_gsmnet->msc_data->msc_con) + if (!bsc_gsmnet->bsc_data->msc.msc_con) return; - if (!bsc_gsmnet->msc_data->msc_con->is_connected) + if (!bsc_gsmnet->bsc_data->msc.msc_con->is_connected) return; - bsc_msc_lost(bsc_gsmnet->msc_data->msc_con); + bsc_msc_lost(bsc_gsmnet->bsc_data->msc.msc_con); break; default: break; @@ -391,7 +391,7 @@ static int verify_net_rf_lock(struct ctrl_cmd *cmd, const char *value, void *dat int main(int argc, char **argv) { - struct osmo_msc_data *data; + struct osmo_bsc_data *data; int rc; tall_bsc_ctx = talloc_named_const(NULL, 1, "openbsc"); @@ -430,7 +430,7 @@ int main(int argc, char **argv) ctrl_cmd_install(CTRL_NODE_NET, &cmd_net_rf_lock); ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_rf_lock); - data = bsc_gsmnet->msc_data; + data = bsc_gsmnet->bsc_data; if (rf_ctrl) bsc_replace_string(data, &data->rf_ctrl_name, rf_ctrl); |