<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9700">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Drop all references of unused MGCP<br><br>Change-Id: I1c023d773bf196d41b4251ca7011a82969acb613<br>---<br>M contrib/jenkins.sh<br>M include/osmocom/sgsn/debug.h<br>M src/gprs/gb_proxy_vty.c<br>M src/libcommon/common_vty.c<br>M src/libcommon/debug.c<br>5 files changed, 3 insertions(+), 15 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 931d14c..d873ee9 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -49,12 +49,12 @@</span><br><span> </span><br><span> cd "$base"</span><br><span> autoreconf --install --force</span><br><span style="color: hsl(0, 100%, 40%);">-./configure --enable-sanitize $enable_werror $MGCP $IU --enable-external-tests</span><br><span style="color: hsl(120, 100%, 40%);">+./configure --enable-sanitize $enable_werror $IU --enable-external-tests</span><br><span> $MAKE $PARALLEL_MAKE</span><br><span> LD_LIBRARY_PATH="$inst/lib" $MAKE check \</span><br><span> || cat-testlogs.sh</span><br><span> LD_LIBRARY_PATH="$inst/lib" \</span><br><span style="color: hsl(0, 100%, 40%);">- DISTCHECK_CONFIGURE_FLAGS="$enable_werror $MGCP $IU --enable-external-tests" \</span><br><span style="color: hsl(120, 100%, 40%);">+ DISTCHECK_CONFIGURE_FLAGS="$enable_werror $IU --enable-external-tests" \</span><br><span> $MAKE distcheck \</span><br><span> || cat-testlogs.sh</span><br><span> </span><br><span>diff --git a/include/osmocom/sgsn/debug.h b/include/osmocom/sgsn/debug.h</span><br><span>index eed2921..4d0fc69 100644</span><br><span>--- a/include/osmocom/sgsn/debug.h</span><br><span>+++ b/include/osmocom/sgsn/debug.h</span><br><span>@@ -19,7 +19,6 @@</span><br><span> DMEAS,</span><br><span> DSCCP,</span><br><span> DMSC,</span><br><span style="color: hsl(0, 100%, 40%);">- DMGCP,</span><br><span> DHO,</span><br><span> DDB,</span><br><span> DREF,</span><br><span>diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c</span><br><span>index 423c582..d7d35fe 100644</span><br><span>--- a/src/gprs/gb_proxy_vty.c</span><br><span>+++ b/src/gprs/gb_proxy_vty.c</span><br><span>@@ -43,7 +43,7 @@</span><br><span> static struct gbproxy_config *g_cfg = NULL;</span><br><span> </span><br><span> /*</span><br><span style="color: hsl(0, 100%, 40%);">- * vty code for mgcp below</span><br><span style="color: hsl(120, 100%, 40%);">+ * vty code for gbproxy below</span><br><span> */</span><br><span> static struct cmd_node gbproxy_node = {</span><br><span> GBPROXY_NODE,</span><br><span>@@ -855,4 +855,3 @@</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/src/libcommon/common_vty.c b/src/libcommon/common_vty.c</span><br><span>index 7b80bcb..6534105 100644</span><br><span>--- a/src/libcommon/common_vty.c</span><br><span>+++ b/src/libcommon/common_vty.c</span><br><span>@@ -99,11 +99,6 @@</span><br><span> vty->node = NAT_NODE;</span><br><span> vty->index = NULL;</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case TRUNK_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = MGCP_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case MGCP_NODE:</span><br><span> case GBPROXY_NODE:</span><br><span> case SGSN_NODE:</span><br><span> case NAT_NODE:</span><br><span>diff --git a/src/libcommon/debug.c b/src/libcommon/debug.c</span><br><span>index 06653a9..27d7575 100644</span><br><span>--- a/src/libcommon/debug.c</span><br><span>+++ b/src/libcommon/debug.c</span><br><span>@@ -99,11 +99,6 @@</span><br><span> .description = "Mobile Switching Center",</span><br><span> .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span> },</span><br><span style="color: hsl(0, 100%, 40%);">- [DMGCP] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "DMGCP",</span><br><span style="color: hsl(0, 100%, 40%);">- .description = "Media Gateway Control Protocol",</span><br><span style="color: hsl(0, 100%, 40%);">- .enabled = 1, .loglevel = LOGL_NOTICE,</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span> [DHO] = {</span><br><span> .name = "DHO",</span><br><span> .description = "Hand-Over",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9700">change 9700</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9700"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1c023d773bf196d41b4251ca7011a82969acb613 </div>
<div style="display:none"> Gerrit-Change-Number: 9700 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>