diff options
author | Daniel Willmann <daniel@totalueberwachung.de> | 2011-07-22 17:55:42 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2012-09-11 12:52:23 +0200 |
commit | 6fc4a98fc5250d009a65d5fa079904400a3ded3d (patch) | |
tree | 0ea250b3d72f6336ed77e84ef1d7a9839142b479 /openbsc/src/osmo-bsc/osmo_bsc_main.c | |
parent | f3b31eb34978d35011ff46edaf40c1a151604197 (diff) |
libctrl: Change controlif_setup so it returns the ctrl handle
nat: Catch up with controlif_setup API change
We now save a control handle reference in the nat
osmo-bsc: Catch up with controlif_setup API change
We now save a control handle reference in the gsm network
Diffstat (limited to 'openbsc/src/osmo-bsc/osmo_bsc_main.c')
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index 63e1d8ea8..aa53eef07 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -19,7 +19,6 @@ */ #include <openbsc/bss.h> -#include <openbsc/control_cmd.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/osmo_bsc.h> @@ -29,6 +28,9 @@ #include <openbsc/vty.h> #include <openbsc/ipaccess.h> +#include <openbsc/control_cmd.h> +#include <openbsc/control_if.h> + #include <osmocom/core/application.h> #include <osmocom/core/linuxlist.h> #include <osmocom/core/talloc.h> @@ -425,7 +427,8 @@ int main(int argc, char **argv) } bsc_api_init(bsc_gsmnet, osmo_bsc_api()); - controlif_setup(bsc_gsmnet, 4249); + bsc_gsmnet->ctrl = controlif_setup(bsc_gsmnet, 4249); + ctrl_cmd_install(CTRL_NODE_NET, &cmd_net_loc); ctrl_cmd_install(CTRL_NODE_NET, &cmd_net_rf_lock); ctrl_cmd_install(CTRL_NODE_TRX, &cmd_trx_rf_lock); |