create libxsc and move some code, never link libbsc and libmsc

libbsc and libmsc have conflicting definitions of gsm_subscriber_connection
and do no longer belong together anyway.

Create libxsc, meaning 'lib[bm]sc', to hold all code used by both libmsc
and libbsc, and make sure gsm_subscriber_connection isn't used there.

In various binaries and tests, do not link libbsc and libmsc.

(Note: this commit was reshaped out of a large wip chunk, it may not
compile properly without the subsequent commits)

5 files changed, 10 insertions, 4 deletions

diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am
index 2a855d039..475e82771 100644
--- a/openbsc/include/openbsc/Makefile.am
+++ b/openbsc/include/openbsc/Makefile.am
@@ -20,7 +20,7 @@ noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \
 		 oap.h oap_messages.h \
 		 gtphub.h \
 		 msc_api.h msc_ifaces.h iu.h iu_cs.h \
-		 common.h
+		 xsc.h
 
 openbsc_HEADERS = gsm_04_08.h meas_rep.h bsc_api.h
 openbscdir = $(includedir)/openbsc
diff --git a/openbsc/include/openbsc/bss.h b/openbsc/include/openbsc/bss.h
index 8705443e1..39957ab7c 100644
--- a/openbsc/include/openbsc/bss.h
+++ b/openbsc/include/openbsc/bss.h
@@ -1,7 +1,7 @@
 #ifndef _BSS_H_
 #define _BSS_H_
 
-#include <openbsc/common.h>
+#include <openbsc/xsc.h>
 
 struct gsm_network;
 struct msgb;
diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index c2c7f2f43..4b0f37245 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -7,7 +7,7 @@
 #include <osmocom/core/select.h>
 
 #include <openbsc/rest_octets.h>
-#include <openbsc/common.h>
+#include <openbsc/xsc.h>
 
 /** annotations for msgb ownership */
 #define __uses
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index d4891a988..e7372ab88 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -24,7 +24,7 @@
 #include <osmocom/gsm/lapdm.h>
 #endif
 
-#include <openbsc/common.h>
+#include <openbsc/xsc.h>
 
 struct osmo_bsc_data;
 
diff --git a/openbsc/include/openbsc/common.h b/openbsc/include/openbsc/xsc.h
index 2a396f3db..b301d5018 100644
--- a/openbsc/include/openbsc/common.h
+++ b/openbsc/include/openbsc/xsc.h
@@ -4,6 +4,8 @@
 
 struct msgb;
 struct gsm_network;
+struct log_info;
+struct ctrl_handle;
 
 typedef int (*mncc_recv_cb_t)(struct gsm_network *, struct msgb *);
 
@@ -15,3 +17,7 @@ struct gsm_encr {
 	uint8_t key[MAX_A5_KEY_LEN];
 };
 
+extern struct gsm_network *vty_global_gsm_network;
+
+int xsc_vty_init(struct gsm_network *network);
+