diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-04-07 23:23:27 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-04-07 23:26:13 +0200 |
commit | 55ef5fb7ef0880544343e757c5614fdce2bba1a3 (patch) | |
tree | b477f90ff939af19a58f8b23ad21cbf793520bc4 /openbsc/src/osmo-bsc/osmo_bsc_main.c | |
parent | 4b41746ce34806aa5fa47b2b5d076d18bfab7c3d (diff) |
bsc: Add the bsc-rf-socket command to master as well
Make it possible to specify the rf-socket path via the
vty configuration as well. The command line setting will
override it though.
Diffstat (limited to 'openbsc/src/osmo-bsc/osmo_bsc_main.c')
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_main.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index 1937d3b00..872b9f116 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -1,6 +1,6 @@ /* (C) 2008-2009 by Harald Welte <laforge@gnumonks.org> - * (C) 2009-2010 by Holger Hans Peter Freyther <zecke@selfish.org> - * (C) 2009-2010 by On-Waves + * (C) 2009-2011 by Holger Hans Peter Freyther <zecke@selfish.org> + * (C) 2009-2011 by On-Waves * All Rights Reserved * * This program is free software; you can redistribute it and/or modify @@ -179,6 +179,7 @@ static void signal_handler(int signal) int main(int argc, char **argv) { + struct osmo_msc_data *data; int rc; log_init(&log_info); @@ -215,9 +216,13 @@ int main(int argc, char **argv) } bsc_api_init(bsc_gsmnet, osmo_bsc_api()); - if (rf_ctl) { - struct osmo_msc_data *data = bsc_gsmnet->msc_data; - data->rf_ctl = osmo_bsc_rf_create(rf_ctl, bsc_gsmnet); + data = bsc_gsmnet->msc_data; + if (rf_ctl) + bsc_replace_string(data, &data->rf_ctrl_name, rf_ctl); + + if (data->rf_ctrl_name) { + data->rf_ctl = osmo_bsc_rf_create(data->rf_ctrl_name, + bsc_gsmnet); if (!data->rf_ctl) { fprintf(stderr, "Failed to create the RF service.\n"); exit(1); |