diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-03-23 16:25:16 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-03-23 16:25:16 +0100 |
commit | 49f9e5b6b42cae9f6083e5c69c70af0b29b15b23 (patch) | |
tree | 544aefa178f61484e1233ffbf83c02d43db30ec1 /openbsc/src/osmo-bsc | |
parent | d883db027bb75cb4299a733d005de6ff6a1f426c (diff) |
ctrl: Move the lookup into a separate file in preparation for GPRS
For GPRS the look-up via bts/trx does not make any sense and would
introduce bad depdencies for the SGSN. Move the look-up code to a
new file and introduce new setup methods.
Diffstat (limited to 'openbsc/src/osmo-bsc')
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_main.c | 2 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_msc.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index 84186a6a5..f701089ab 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -212,7 +212,7 @@ int main(int argc, char **argv) } bsc_api_init(bsc_gsmnet, osmo_bsc_api()); - bsc_gsmnet->ctrl = controlif_setup(bsc_gsmnet, 4249); + bsc_gsmnet->ctrl = bsc_controlif_setup(bsc_gsmnet, 4249); if (!bsc_gsmnet) { fprintf(stderr, "Failed to init the control interface. Exiting.\n"); exit(1); diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c index 5517d3080..603398551 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c @@ -22,6 +22,7 @@ #include <openbsc/bsc_nat.h> #include <openbsc/control_cmd.h> +#include <openbsc/control_if.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/ipaccess.h> @@ -217,7 +218,7 @@ static void handle_ctrl(struct osmo_msc_data *msc, struct msgb *msg) return; } - ret = ctrl_cmd_handle(cmd, msc->network); + ret = bsc_ctrl_cmd_handle(cmd, msc->network); if (ret != CTRL_CMD_HANDLED) ctrl_cmd_send(&msc->msc_con->write_queue, cmd); talloc_free(cmd); |