summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-04 01:29:03 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-03-09 18:34:17 +0100
commit97579fb2893fbf316927d31838ba47445ca379ae (patch)
tree7210039b1559e4e54c6546ab1f3e450fb61183d1
parenta6cc69b7ff6b69fe779229859238ff75f4acd8a8 (diff)
move iucs_ranap.[hc] to include / libmsc to use in msc_vlr tests
-rw-r--r--openbsc/include/openbsc/Makefile.am1
-rw-r--r--openbsc/include/openbsc/iucs_ranap.h (renamed from openbsc/src/osmo-msc/iucs_ranap.h)1
-rw-r--r--openbsc/src/libmsc/Makefile.am2
-rw-r--r--openbsc/src/libmsc/iucs_ranap.c (renamed from openbsc/src/osmo-msc/iucs_ranap.c)3
-rw-r--r--openbsc/src/osmo-msc/Makefile.am5
-rw-r--r--openbsc/src/osmo-msc/msc_main.c3
6 files changed, 6 insertions, 9 deletions
diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am
index 7046966..14396b7 100644
--- a/openbsc/include/openbsc/Makefile.am
+++ b/openbsc/include/openbsc/Makefile.am
@@ -48,6 +48,7 @@ noinst_HEADERS = \
ipaccess.h \
iu.h \
iucs.h \
+ iucs_ranap.h \
meas_feed.h \
meas_rep.h \
mgcp.h \
diff --git a/openbsc/src/osmo-msc/iucs_ranap.h b/openbsc/include/openbsc/iucs_ranap.h
index 0aa1ee9..748de23 100644
--- a/openbsc/src/osmo-msc/iucs_ranap.h
+++ b/openbsc/include/openbsc/iucs_ranap.h
@@ -1,5 +1,6 @@
#pragma once
+struct gsm_network;
struct ue_conn_ctx;
int iucs_rx_ranap_event(struct gsm_network *network,
diff --git a/openbsc/src/libmsc/Makefile.am b/openbsc/src/libmsc/Makefile.am
index 9e13ca5..a320f7d 100644
--- a/openbsc/src/libmsc/Makefile.am
+++ b/openbsc/src/libmsc/Makefile.am
@@ -12,6 +12,7 @@ AM_CFLAGS = \
$(COVERAGE_CFLAGS) \
$(LIBCRYPTO_CFLAGS) \
$(LIBSMPP34_CFLAGS) \
+ $(LIBASN1C_CFLAGS) \
$(NULL)
noinst_HEADERS = \
@@ -32,6 +33,7 @@ libmsc_a_SOURCES = \
gsm_04_80.c \
gsm_subscriber.c \
iucs.c \
+ iucs_ranap.c \
mncc.c \
mncc_builtin.c \
mncc_sock.c \
diff --git a/openbsc/src/osmo-msc/iucs_ranap.c b/openbsc/src/libmsc/iucs_ranap.c
index 09b8148..b16eebc 100644
--- a/openbsc/src/osmo-msc/iucs_ranap.c
+++ b/openbsc/src/libmsc/iucs_ranap.c
@@ -31,8 +31,7 @@
#include <openbsc/iu.h>
#include <openbsc/iucs.h>
#include <openbsc/vlr.h>
-
-#include "iucs_ranap.h"
+#include <openbsc/iucs_ranap.h>
/* To continue authorization after a Security Mode Complete */
int gsm0408_authorize(struct gsm_subscriber_connection *conn);
diff --git a/openbsc/src/osmo-msc/Makefile.am b/openbsc/src/osmo-msc/Makefile.am
index a606b58..1e6a35b 100644
--- a/openbsc/src/osmo-msc/Makefile.am
+++ b/openbsc/src/osmo-msc/Makefile.am
@@ -27,13 +27,8 @@ bin_PROGRAMS = \
osmo-msc \
$(NULL)
-noinst_HEADERS = \
- iucs_ranap.h \
- $(NULL)
-
osmo_msc_SOURCES = \
msc_main.c \
- iucs_ranap.c \
$(NULL)
osmo_msc_LDADD = \
diff --git a/openbsc/src/osmo-msc/msc_main.c b/openbsc/src/osmo-msc/msc_main.c
index b676168..b79f161 100644
--- a/openbsc/src/osmo-msc/msc_main.c
+++ b/openbsc/src/osmo-msc/msc_main.c
@@ -71,8 +71,7 @@
#include <openbsc/msc_ifaces.h>
#include <openbsc/iu.h>
#include <openbsc/iucs.h>
-
-#include "iucs_ranap.h"
+#include <openbsc/iucs_ranap.h>
static const char * const osmomsc_copyright =
"OsmoMSC - Osmocom Circuit-Switched Core Network implementation\r\n"