HACK: update osmo-mss to current masterlaforge/ganc

... still, tons of unresolved symbols while linking that need to be
resolved:

undefined reference to `bsc_api_init'
undefined reference to `calc_initial_idx'
undefined reference to `rsl_ipacc_mdcx_to_rtpsock'
undefined reference to `bsc_handover_pending'
undefined reference to `rsl_ipacc_mdcx_to_rtpsock'
undefined reference to `gsm48_tx_mm_serv_ack'
undefined reference to `rsl_ipacc_mdcx'
undefined reference to `rsl_ipacc_mdcx_to_rtpsock'
undefined reference to `rsl_ipacc_mdcx_to_rtpsock'
undefined reference to `gsm0808_assign_req'
undefined reference to `rsl_ipacc_mdcx'
undefined reference to `rsl_ipacc_mdcx'
undefined reference to `gsm48_tx_mm_serv_rej'
undefined reference to `gsm48_handle_paging_resp'
undefined reference to `gsm48_tx_mm_serv_rej'
undefined reference to `send_siemens_mrpci'
undefined reference to `gsm48_tx_mm_serv_rej'
undefined reference to `gsm0808_assign_req'
undefined reference to `rsl_ipacc_mdcx'
undefined reference to `tall_fle_ctx'
undefined reference to `tall_paging_ctx'

3 files changed, 5 insertions, 16 deletions

diff --git a/openbsc/src/osmo-mss/Makefile.am b/openbsc/src/osmo-mss/Makefile.am
index 450741d70..4dc100708 100644
--- a/openbsc/src/osmo-mss/Makefile.am
+++ b/openbsc/src/osmo-mss/Makefile.am
@@ -6,10 +6,9 @@ bin_PROGRAMS = osmo-mss
 
 osmo_mss_SOURCES = mss_hack.c stubs.c
 osmo_mss_LDADD = \
-		$(top_builddir)/src/libbsc/gsm_subscriber_base.o \
 		$(top_builddir)/src/libmsc/libmsc.a \
 		$(top_builddir)/src/libtrau/libtrau.a \
-		$(top_builddir)/src/libctrl/libctrl.a \
 		$(top_builddir)/src/libcommon/libcommon.a \
-		-ldbi -ldl $(LIBCRYPT) $(LIBOSMOGSM_LIBS) \
-		$(LIBOSMOVTY_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCORE_LIBS)
+		-ldbi -ldl $(LIBCRYPT) \
+		$(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOCORE_LIBS) \
+		$(LIBOSMOCTRL_LIBS) $(LIBOSMOABIS_LIBS) $(LIBSMPP34_LIBS) $(LIBCRYPTO_LIBS)
diff --git a/openbsc/src/osmo-mss/mss_hack.c b/openbsc/src/osmo-mss/mss_hack.c
index e26e89b0d..142505e21 100644
--- a/openbsc/src/osmo-mss/mss_hack.c
+++ b/openbsc/src/osmo-mss/mss_hack.c
@@ -45,17 +45,14 @@
 #include <openbsc/token_auth.h>
 #include <openbsc/handover_decision.h>
 #include <openbsc/rrlp.h>
-#include <openbsc/control_if.h>
 #include <openbsc/osmo_bsc_rf.h>
 
 #include "../../bscconfig.h"
 
 /* MCC and MNC for the Location Area Identifier */
 struct gsm_network *bsc_gsmnet = 0;
-static struct osmo_bsc_rf *rf_ctrl;
 static const char *database_name = "hlr.sqlite3";
 static const char *config_file = "openbsc.cfg";
-static const char *rf_ctrl_name = NULL;
 extern const char *openbsc_copyright;
 static int daemonize = 0;
 static int use_mncc_sock = 0;
@@ -99,7 +96,6 @@ static void print_help()
 	printf("  -e --log-level number. Set a global loglevel.\n");
 	printf("  -m --mncc-sock Disable built-in MNCC handler and offer socket\n");
 	printf("  -C --no-dbcounter Disable regular syncing of counters to database\n");
-	printf("  -r --rf-ctl NAME. A unix domain socket to listen for cmds.\n");
 }
 
 static void handle_options(int argc, char **argv)
@@ -121,11 +117,10 @@ static void handle_options(int argc, char **argv)
 			{"log-level", 1, 0, 'e'},
 			{"mncc-sock", 0, 0, 'm'},
 			{"no-dbcounter", 0, 0, 'C'},
-			{"rf-ctl", 1, 0, 'r'},
 			{0, 0, 0, 0}
 		};
 
-		c = getopt_long(argc, argv, "hd:Dsl:ar:p:TPVc:e:mCr:",
+		c = getopt_long(argc, argv, "hd:Dsl:ar:p:TPVc:e:mC:",
 				long_options, &option_index);
 		if (c == -1)
 			break;
@@ -169,9 +164,6 @@ static void handle_options(int argc, char **argv)
 			print_version(1);
 			exit(0);
 			break;
-		case 'r':
-			rf_ctrl_name = optarg;
-			break;
 		default:
 			/* ignore */
 			break;
@@ -186,7 +178,6 @@ static void signal_handler(int signal)
 
 	switch (signal) {
 	case SIGINT:
-		bsc_shutdown_net(bsc_gsmnet);
 		osmo_signal_dispatch(SS_L_GLOBAL, S_L_GLOBAL_SHUTDOWN, NULL);
 		sleep(3);
 		exit(0);
@@ -260,7 +251,6 @@ int main(int argc, char **argv)
 		exit(1);
 	bsc_api_init(bsc_gsmnet, msc_bsc_api());
 
-	controlif_setup(bsc_gsmnet, 4250);
 	/* seed the PRNG */
 	srand(time(NULL));
 
diff --git a/openbsc/src/osmo-mss/stubs.c b/openbsc/src/osmo-mss/stubs.c
index 42d5094f1..6aed0f219 100644
--- a/openbsc/src/osmo-mss/stubs.c
+++ b/openbsc/src/osmo-mss/stubs.c
@@ -6,7 +6,7 @@
 struct gsm_subscriber_connection *connection_for_subscr(struct gsm_subscriber *subscr)
 {
 	struct gsm_bts *bts;
-	struct gsm_network *net = subscr->net;
+	struct gsm_network *net = subscr->group->net;
 	struct gsm_lchan *lchan;
 
 	/* FIXME: iterate over all existing GAN associations and see if we have