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/osmo-msc | |
| 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/osmo-msc')
| -rw-r--r-- | src/osmo-msc/Makefile.am | 1 | ||||
| -rw-r--r-- | src/osmo-msc/msc_main.c | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am index bd734d106..87b6133f9 100644 --- a/src/osmo-msc/Makefile.am +++ b/src/osmo-msc/Makefile.am @@ -50,7 +50,6 @@ osmo_msc_LDADD = \ $(NULL) if BUILD_IU osmo_msc_LDADD += \ - $(top_builddir)/src/libiu/libiu.a \ $(LIBOSMORANAP_LIBS) \ $(LIBASN1C_LIBS) \ $(NULL) diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index cd713eee6..de6af5dd6 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -66,9 +66,11 @@ #include <osmocom/sigtran/osmo_ss7.h> #include <openbsc/mgcpgw_client.h> -#include <openbsc/msc_ifaces.h> +#ifdef BUILD_IU +#include <osmocom/ranap/iu_client.h> +#endif -#include <openbsc/iu.h> +#include <openbsc/msc_ifaces.h> #include <openbsc/iucs.h> #include <openbsc/iucs_ranap.h> #include <openbsc/a_iface.h> @@ -312,6 +314,7 @@ static struct vty_app_info msc_vty_info = { .is_config_node = bsc_vty_is_config_node, }; +#ifdef BUILD_IU static int rcvmsg_iu_cs(struct msgb *msg, struct gprs_ra_id *ra_id, uint16_t *sai) { DEBUGP(DIUCS, "got IuCS message" @@ -326,14 +329,15 @@ static int rcvmsg_iu_cs(struct msgb *msg, struct gprs_ra_id *ra_id, uint16_t *sa return gsm0408_rcvmsg_iucs(msc_network, msg, ra_id? &ra_id->lac : NULL); } -static int rx_iu_event(struct ue_conn_ctx *ctx, enum iu_event_type type, +static int rx_iu_event(struct ranap_ue_conn_ctx *ctx, enum ranap_iu_event_type type, void *data) { DEBUGP(DIUCS, "got IuCS event %u: %s\n", type, - iu_event_type_str(type)); + ranap_iu_event_type_str(type)); return iucs_rx_ranap_event(msc_network, ctx, type, data); } +#endif #define DEFAULT_M3UA_REMOTE_IP "127.0.0.1" #define DEFAULT_PC_A "0.23.1" @@ -564,7 +568,7 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i #ifdef BUILD_IU /* Set up IuCS */ - iu_init(tall_msc_ctx, msc_network->iu.sccp, rcvmsg_iu_cs, rx_iu_event); + ranap_iu_init(tall_msc_ctx, DRANAP, "OsmoMSC-IuCS", msc_network->iu.sccp, rcvmsg_iu_cs, rx_iu_event); #endif /* Set up A interface */ |