From b271e460490131f7d9c4873057b7ebe0826803b8 Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Wed, 5 Jul 2017 15:19:52 +0200
Subject: 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

Change-Id: Ib8c4fcdb4766c5e575618b95ce16dce51063206b
---
 src/osmo-msc/Makefile.am | 1 -
 src/osmo-msc/msc_main.c  | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/osmo-msc')

diff --git a/src/osmo-msc/Makefile.am b/src/osmo-msc/Makefile.am
index 1e6a35b86..97bd999cf 100644
--- a/src/osmo-msc/Makefile.am
+++ b/src/osmo-msc/Makefile.am
@@ -35,7 +35,6 @@ osmo_msc_LDADD = \
 	$(top_builddir)/src/libmsc/libmsc.a \
 	$(top_builddir)/src/libvlr/libvlr.a \
 	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
-	$(top_builddir)/src/libiu/libiu.a \
 	$(top_builddir)/src/libtrau/libtrau.a \
 	$(top_builddir)/src/libcommon/libcommon.a \
 	$(top_builddir)/src/libmgcp/libmgcp.a \
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index 06e228aa2..6e3f20b6d 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -68,8 +68,8 @@
 #include <osmocom/sigtran/osmo_ss7.h>
 #include <openbsc/mgcpgw_client.h>
 
+#include <osmocom/ranap/iu_client.h>
 #include <openbsc/msc_ifaces.h>
-#include <openbsc/iu.h>
 #include <openbsc/iucs.h>
 #include <openbsc/iucs_ranap.h>
 #include <openbsc/a_iface.h>
@@ -329,11 +329,11 @@ static int rcvmsg_iu_cs(struct msgb *msg, struct gprs_ra_id *ra_id, /* FIXME gpr
 	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);
 }
@@ -508,7 +508,7 @@ TODO: we probably want some of the _net_ ctrl commands from bsc_base_ctrl_cmds_i
 	}
 
 	/* Set up IuCS */
-	iu_init(tall_msc_ctx, msc_network->sccp, rcvmsg_iu_cs, rx_iu_event);
+	ranap_iu_init(tall_msc_ctx, DRANAP, "OsmoMSC-IuCS", msc_network->sccp, rcvmsg_iu_cs, rx_iu_event);
 
 	/* Set up A interface */
 	a_init(msc_network->sccp, msc_network);
-- 
cgit v1.2.3