diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-07-05 15:19:52 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-08-29 12:51:18 +0000 |
commit | 00e82d61ab7bbdcf09c2c88c159dd6e8fac72387 (patch) | |
tree | 83aa888237576c3ca6ca22b82b6b9eb9f3b63b12 /src/libmsc/msc_vty.c | |
parent | 6d82bec2c8cd3636fbce09757610762e5bd85b06 (diff) |
move libiu to osmo-iuh/libosmo-ranap
Remove libiu here, use the functions from libosmo-ranap instead, by applying
the ranap_ / RANAP_ prefix.
Corresponding change-id in osmo-iuh.git is I6a3f7ad15be03fb94689b4af6ccfa828c25f45c0
To be able to run the msc_vlr tests for RAN_UTRAN_IU without Iu client headers
available, add iu_dummy.h, containing mere function signatures that match
iu_dummy.c and a mostly empty struct ranap_ue_conn_ctx.
Make sure we can build with and without --enable-iu: include osmo-iuh headers
only with --enable-iu.
Change-Id: Ib8c4fcdb4766c5e575618b95ce16dce51063206b
Diffstat (limited to 'src/libmsc/msc_vty.c')
-rw-r--r-- | src/libmsc/msc_vty.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 01e7e8295..6ae4529a1 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -23,15 +23,19 @@ /* NOTE: I would have liked to call this the MSC_NODE instead of the MSC_NODE, * but MSC_NODE already exists to configure a remote MSC for osmo-bsc. */ +#include "../../bscconfig.h" + #include <inttypes.h> #include <osmocom/vty/command.h> +#ifdef BUILD_IU +#include <osmocom/ranap/iu_client.h> +#endif #include <openbsc/vty.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/vlr.h> -#include <openbsc/iu.h> static struct cmd_node msc_node = { MSC_NODE, @@ -99,7 +103,7 @@ static int config_write_msc(struct vty *vty) mgcpgw_client_config_write(vty, " "); #ifdef BUILD_IU - iu_vty_config_write(vty, " "); + ranap_iu_vty_config_write(vty, " "); #endif return CMD_SUCCESS; @@ -153,6 +157,6 @@ void msc_vty_init(struct gsm_network *msc_network) mgcpgw_client_vty_init(MSC_NODE, &msc_network->mgcpgw.conf); #ifdef BUILD_IU - iu_vty_init(MSC_NODE, &msc_network->iu.rab_assign_addr_enc); + ranap_iu_vty_init(MSC_NODE, &msc_network->iu.rab_assign_addr_enc); #endif } |