From 94998fad7a93909b96b0a152c240e361f81f77cb Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Wed, 20 Jun 2018 23:55:22 +0200
Subject: Drop all references of unused MGCP

Change-Id: I1c023d773bf196d41b4251ca7011a82969acb613
---
 contrib/jenkins.sh           | 4 ++--
 include/osmocom/sgsn/debug.h | 1 -
 src/gprs/gb_proxy_vty.c      | 3 +--
 src/libcommon/common_vty.c   | 5 -----
 src/libcommon/debug.c        | 5 -----
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 931d14c89..d873ee92e 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -49,12 +49,12 @@ set -x
 
 cd "$base"
 autoreconf --install --force
-./configure --enable-sanitize $enable_werror $MGCP $IU --enable-external-tests
+./configure --enable-sanitize $enable_werror $IU --enable-external-tests
 $MAKE $PARALLEL_MAKE
 LD_LIBRARY_PATH="$inst/lib" $MAKE check \
   || cat-testlogs.sh
 LD_LIBRARY_PATH="$inst/lib" \
-  DISTCHECK_CONFIGURE_FLAGS="$enable_werror $MGCP $IU --enable-external-tests" \
+  DISTCHECK_CONFIGURE_FLAGS="$enable_werror $IU --enable-external-tests" \
   $MAKE distcheck \
   || cat-testlogs.sh
 
diff --git a/include/osmocom/sgsn/debug.h b/include/osmocom/sgsn/debug.h
index eed29213e..4d0fc6987 100644
--- a/include/osmocom/sgsn/debug.h
+++ b/include/osmocom/sgsn/debug.h
@@ -19,7 +19,6 @@ enum {
 	DMEAS,
 	DSCCP,
 	DMSC,
-	DMGCP,
 	DHO,
 	DDB,
 	DREF,
diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c
index 423c582f3..d7d35fe7c 100644
--- a/src/gprs/gb_proxy_vty.c
+++ b/src/gprs/gb_proxy_vty.c
@@ -43,7 +43,7 @@
 static struct gbproxy_config *g_cfg = NULL;
 
 /*
- * vty code for mgcp below
+ * vty code for gbproxy below
  */
 static struct cmd_node gbproxy_node = {
 	GBPROXY_NODE,
@@ -855,4 +855,3 @@ int gbproxy_parse_config(const char *config_file, struct gbproxy_config *cfg)
 
 	return 0;
 }
-
diff --git a/src/libcommon/common_vty.c b/src/libcommon/common_vty.c
index 7b80bcb42..65341057c 100644
--- a/src/libcommon/common_vty.c
+++ b/src/libcommon/common_vty.c
@@ -99,11 +99,6 @@ int bsc_vty_go_parent(struct vty *vty)
 		vty->node = NAT_NODE;
 		vty->index = NULL;
 		break;
-	case TRUNK_NODE:
-		vty->node = MGCP_NODE;
-		vty->index = NULL;
-		break;
-	case MGCP_NODE:
 	case GBPROXY_NODE:
 	case SGSN_NODE:
 	case NAT_NODE:
diff --git a/src/libcommon/debug.c b/src/libcommon/debug.c
index 06653a977..27d757554 100644
--- a/src/libcommon/debug.c
+++ b/src/libcommon/debug.c
@@ -99,11 +99,6 @@ static const struct log_info_cat default_categories[] = {
 		.description = "Mobile Switching Center",
 		.enabled = 1, .loglevel = LOGL_NOTICE,
 	},
-	[DMGCP] = {
-		.name = "DMGCP",
-		.description = "Media Gateway Control Protocol",
-		.enabled = 1, .loglevel = LOGL_NOTICE,
-	},
 	[DHO] = {
 		.name = "DHO",
 		.description = "Hand-Over",
-- 
cgit v1.2.3