[PATCH] osmo-bsc[master]: Provide ipaccess-config and bs11_config again

[lynxis lazus]

Review at  https://gerrit.osmocom.org/7381

Provide ipaccess-config and bs11_config again

In 3561bd48976d both binaries were disabled. Enable the compilation.
To reduce dependencies down to one function call,
move bsc_subscr_conn_fsm.c out of libbsc.

Fixes: 3561bd48976d ("introduce an osmo_fsm for gsm_subscriber_connection")
Change-Id: I4e7e503f1bc9d7401ccf21f1a619e1adb6c54b5e
---
M src/ipaccess/Makefile.am
M src/ipaccess/ipaccess-config.c
M src/libbsc/Makefile.am
M src/osmo-bsc/Makefile.am
R src/osmo-bsc/bsc_subscr_conn_fsm.c
M src/utils/Makefile.am
M src/utils/bs11_config.c
7 files changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/7381/1

diff --git a/src/ipaccess/Makefile.am b/src/ipaccess/Makefile.am
index 9b2a83e..a6195b9 100644
--- a/src/ipaccess/Makefile.am
+++ b/src/ipaccess/Makefile.am
@@ -24,6 +24,7 @@
 
 bin_PROGRAMS = \
 	abisip-find \
+	ipaccess-config \
 	ipaccess-proxy \
 	$(NULL)
 
diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c
index 7b9bd02..3d96c11 100644
--- a/src/ipaccess/ipaccess-config.c
+++ b/src/ipaccess/ipaccess-config.c
@@ -875,6 +875,10 @@
 
 extern void bts_model_nanobts_init();
 
+struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) {
+	OSMO_ASSERT(0);
+}
+
 static const struct log_info_cat log_categories[] = {
 	[DNM] = {
 		.name = "DNM",
diff --git a/src/libbsc/Makefile.am b/src/libbsc/Makefile.am
index 8956363..a708eae 100644
--- a/src/libbsc/Makefile.am
+++ b/src/libbsc/Makefile.am
@@ -63,6 +63,5 @@
 	handover_cfg.c \
 	penalty_timers.c \
 	handover_decision_2.c \
-	bsc_subscr_conn_fsm.c \
 	$(NULL)
 
diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am
index cc96743..b67061c 100644
--- a/src/osmo-bsc/Makefile.am
+++ b/src/osmo-bsc/Makefile.am
@@ -36,6 +36,7 @@
 	osmo_bsc_bssap.c \
 	osmo_bsc_audio.c \
 	osmo_bsc_ctrl.c \
+	bsc_subscr_conn_fsm.c \
 	$(NULL)
 
 osmo_bsc_LDADD = \
diff --git a/src/libbsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c
similarity index 100%
rename from src/libbsc/bsc_subscr_conn_fsm.c
rename to src/osmo-bsc/bsc_subscr_conn_fsm.c
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 0c681a5..983a3bb 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -22,6 +22,7 @@
 	$(NULL)
 
 bin_PROGRAMS = \
+	bs11_config \
 	isdnsync \
 	meas_json \
 	$(NULL)
diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c
index bc0f488..9c08c20 100644
--- a/src/utils/bs11_config.c
+++ b/src/utils/bs11_config.c
@@ -902,6 +902,10 @@
 
 extern void *tall_fle_ctx;
 
+struct gsm_subscriber_connection *bsc_subscr_con_allocate(struct gsm_network *net) {
+	OSMO_ASSERT(0);
+}
+
 int main(int argc, char **argv)
 {
 	struct gsm_network *gsmnet;

-- 
To view, visit https://gerrit.osmocom.org/7381
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e7e503f1bc9d7401ccf21f1a619e1adb6c54b5e
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>