Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/9700 )
Change subject: Drop all references of unused MGCP
......................................................................
Drop all references of unused MGCP
Change-Id: I1c023d773bf196d41b4251ca7011a82969acb613
---
M contrib/jenkins.sh
M include/osmocom/sgsn/debug.h
M src/gprs/gb_proxy_vty.c
M src/libcommon/common_vty.c
M src/libcommon/debug.c
5 files changed, 3 insertions(+), 15 deletions(-)
Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 931d14c..d873ee9 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -49,12 +49,12 @@
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 eed2921..4d0fc69 100644
--- a/include/osmocom/sgsn/debug.h
+++ b/include/osmocom/sgsn/debug.h
@@ -19,7 +19,6 @@
DMEAS,
DSCCP,
DMSC,
- DMGCP,
DHO,
DDB,
DREF,
diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c
index 423c582..d7d35fe 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 @@
return 0;
}
-
diff --git a/src/libcommon/common_vty.c b/src/libcommon/common_vty.c
index 7b80bcb..6534105 100644
--- a/src/libcommon/common_vty.c
+++ b/src/libcommon/common_vty.c
@@ -99,11 +99,6 @@
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 06653a9..27d7575 100644
--- a/src/libcommon/debug.c
+++ b/src/libcommon/debug.c
@@ -99,11 +99,6 @@
.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",
--
To view, visit https://gerrit.osmocom.org/9700
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c023d773bf196d41b4251ca7011a82969acb613
Gerrit-Change-Number: 9700
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pes...@sysmocom.de>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Vadim Yanitskiy <axilira...@gmail.com>
