From becfc4cb1ba9d759915a5b430aedc0d29c67858b Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <nhofmeyr@sysmocom.de>
Date: Wed, 19 Jul 2017 16:48:42 +0200
Subject: move to osmo-mgw.git: osmo-bsc_mgcp and libmgcp as
 libosmo-legacy-mgcp

Rewire build and includes to libosmo-legacy-mgcp.

Drop osmo-bsc_mgcp and related python tests, now found in osmo-mgw.git.

libosmo-legacy-mgcp is installed from osmo-mgw, hence add the dependency to
jenkins.sh (so far using the pre_release branch).

Change-Id: Ic99d681759edce11564da62500c2aac5cf5fffe2
---
 src/osmo-bsc_nat/Makefile.am      | 4 +++-
 src/osmo-bsc_nat/bsc_mgcp_utils.c | 4 ++--
 src/osmo-bsc_nat/bsc_nat_ctrl.c   | 1 +
 src/osmo-bsc_nat/bsc_nat_vty.c    | 8 ++++----
 src/osmo-bsc_nat/bsc_ussd.c       | 1 +
 5 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/osmo-bsc_nat')

diff --git a/src/osmo-bsc_nat/Makefile.am b/src/osmo-bsc_nat/Makefile.am
index b7c13ad3e..1eec7aa1c 100644
--- a/src/osmo-bsc_nat/Makefile.am
+++ b/src/osmo-bsc_nat/Makefile.am
@@ -13,6 +13,7 @@ AM_CFLAGS = \
 	$(LIBOSMOSCCP_CFLAGS) \
 	$(LIBOSMOABIS_CFLAGS) \
 	$(LIBOSMONETIF_CFLAGS) \
+	$(LIBOSMOLEGACYMGCP_CFLAGS) \
 	$(LIBCRYPTO_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
@@ -40,7 +41,6 @@ osmo_bsc_nat_SOURCES = \
 	$(NULL)
 
 osmo_bsc_nat_LDADD = \
-	$(top_builddir)/src/libmgcp/libmgcp.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
 	$(top_builddir)/src/libbsc/libbsc.a \
 	$(top_builddir)/src/libcommon-cs/libcommon-cs.a \
@@ -54,6 +54,8 @@ osmo_bsc_nat_LDADD = \
 	$(LIBOSMOABIS_LIBS) \
 	$(LIBOSMONETIF_LIBS) \
 	$(LIBOSMOSIGTRAN_LIBS) \
+	$(LIBOSMOLEGACYMGCP_LIBS) \
 	$(LIBCRYPTO_LIBS) \
+	$(LIBRARY_GSM) \
 	-lrt \
 	$(NULL)
diff --git a/src/osmo-bsc_nat/bsc_mgcp_utils.c b/src/osmo-bsc_nat/bsc_mgcp_utils.c
index 7df362f89..49050fc89 100644
--- a/src/osmo-bsc_nat/bsc_mgcp_utils.c
+++ b/src/osmo-bsc_nat/bsc_mgcp_utils.c
@@ -48,8 +48,8 @@
 #include <openbsc/gsm_data.h>
 #include <openbsc/debug.h>
 #include <openbsc/ipaccess.h>
-#include <openbsc/mgcp.h>
-#include <openbsc/mgcp_internal.h>
+#include <osmocom/legacy_mgcp/mgcp.h>
+#include <osmocom/legacy_mgcp/mgcp_internal.h>
 #include <openbsc/osmux.h>
 
 #include <osmocom/ctrl/control_cmd.h>
diff --git a/src/osmo-bsc_nat/bsc_nat_ctrl.c b/src/osmo-bsc_nat/bsc_nat_ctrl.c
index 128ea6518..ff6a73978 100644
--- a/src/osmo-bsc_nat/bsc_nat_ctrl.c
+++ b/src/osmo-bsc_nat/bsc_nat_ctrl.c
@@ -32,6 +32,7 @@
 #include <openbsc/bsc_msg_filter.h>
 #include <openbsc/vty.h>
 #include <openbsc/gsm_data.h>
+#include <openbsc/debug.h>
 
 #include <unistd.h>
 #include <string.h>
diff --git a/src/osmo-bsc_nat/bsc_nat_vty.c b/src/osmo-bsc_nat/bsc_nat_vty.c
index a11ae151e..fed530676 100644
--- a/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -25,7 +25,7 @@
 #include <openbsc/bsc_msg_filter.h>
 #include <openbsc/bsc_msc.h>
 #include <openbsc/gsm_04_08.h>
-#include <openbsc/mgcp.h>
+#include <osmocom/legacy_mgcp/mgcp.h>
 #include <openbsc/vty.h>
 #include <openbsc/nat_rewrite_trie.h>
 
@@ -1213,15 +1213,15 @@ DEFUN(cfg_bsc_osmux,
 		conf->osmux = OSMUX_USAGE_ONLY;
 
 	if (old == 0 && conf->osmux > 0 && !conf->nat->mgcp_cfg->osmux_init) {
-		LOGP(DMGCP, LOGL_NOTICE, "Setting up OSMUX socket\n");
+		LOGP(DLMGCP, LOGL_NOTICE, "Setting up OSMUX socket\n");
 		if (osmux_init(OSMUX_ROLE_BSC_NAT, conf->nat->mgcp_cfg) < 0) {
-			LOGP(DMGCP, LOGL_ERROR, "Cannot init OSMUX\n");
+			LOGP(DLMGCP, LOGL_ERROR, "Cannot init OSMUX\n");
 			vty_out(vty, "%% failed to create Osmux socket%s",
 				VTY_NEWLINE);
 			return CMD_WARNING;
 		}
 	} else if (old > 0 && conf->osmux == 0) {
-		LOGP(DMGCP, LOGL_NOTICE, "Disabling OSMUX socket\n");
+		LOGP(DLMGCP, LOGL_NOTICE, "Disabling OSMUX socket\n");
 		/* Don't stop the socket, we may already have ongoing voice
 		 * flows already using Osmux. This just switch indicates that
 		 * new upcoming flows should use RTP.
diff --git a/src/osmo-bsc_nat/bsc_ussd.c b/src/osmo-bsc_nat/bsc_ussd.c
index 0ba63270d..9769bbd39 100644
--- a/src/osmo-bsc_nat/bsc_ussd.c
+++ b/src/osmo-bsc_nat/bsc_ussd.c
@@ -25,6 +25,7 @@
 #include <openbsc/bsc_msg_filter.h>
 #include <openbsc/ipaccess.h>
 #include <openbsc/socket.h>
+#include <openbsc/debug.h>
 
 #include <osmocom/gsm/protocol/gsm_08_08.h>
 #include <osmocom/gsm/gsm0480.h>
-- 
cgit v1.2.3