<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9701">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 unused common_vty.c<br><br>Change-Id: I19f1ece5f2f62d1f8f40a9b9d0c6c41ad05e5c76<br>---<br>M debian/copyright<br>M src/libcommon/Makefile.am<br>D src/libcommon/common_vty.c<br>3 files changed, 0 insertions(+), 143 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian/copyright b/debian/copyright</span><br><span>index 8094f2a..65f3ba7 100644</span><br><span>--- a/debian/copyright</span><br><span>+++ b/debian/copyright</span><br><span>@@ -123,7 +123,6 @@</span><br><span> src/gprs/sgsn_libgtp.c</span><br><span> src/gprs/sgsn_main.c</span><br><span> src/gprs/sgsn_vty.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/libcommon/common_vty.c</span><br><span> src/libcommon/debug.c</span><br><span> src/libcommon/gsm_data.c</span><br><span> src/libcommon/gsm_data_shared.c</span><br><span>diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am</span><br><span>index 737265b..69fb37d 100644</span><br><span>--- a/src/libcommon/Makefile.am</span><br><span>+++ b/src/libcommon/Makefile.am</span><br><span>@@ -18,7 +18,6 @@</span><br><span> $(NULL)</span><br><span> </span><br><span> libcommon_a_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- common_vty.c \</span><br><span> debug.c \</span><br><span> gsm_data.c \</span><br><span> gsm_data_shared.c \</span><br><span>diff --git a/src/libcommon/common_vty.c b/src/libcommon/common_vty.c</span><br><span>deleted file mode 100644</span><br><span>index 6534105..0000000</span><br><span>--- a/src/libcommon/common_vty.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,141 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/* OpenBSC VTY common helpers */</span><br><span style="color: hsl(0, 100%, 40%);">-/* (C) 2009-2010 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(0, 100%, 40%);">- * (C) 2009-2010 by Holger Hans Peter Freyther</span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(0, 100%, 40%);">- * (at your option) any later version.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU Affero General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(0, 100%, 40%);">- * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <stdlib.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <string.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/core/talloc.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/sgsn/vty.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/sgsn/debug.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/sgsn/gsm_subscriber.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/sgsn/bsc_nat.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/sgsn/abis_om2000.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/vty/telnet_interface.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/vty/command.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/vty/buffer.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/vty/vty.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int bsc_vty_go_parent(struct vty *vty)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- switch (vty->node) {</span><br><span style="color: hsl(0, 100%, 40%);">- case GSMNET_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = CONFIG_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 BTS_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = GSMNET_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- /* set vty->index correctly ! */</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index = bts->network;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index_sub = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case TRX_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = BTS_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- /* set vty->index correctly ! */</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx *trx = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index = trx->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index_sub = &trx->bts->description;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case TS_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = TRX_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- /* set vty->index correctly ! */</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_trx_ts *ts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index = ts->trx;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index_sub = &ts->trx->description;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case OML_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case OM2K_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = ENABLE_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">- /* NOTE: this only works because it's not part of the config</span><br><span style="color: hsl(0, 100%, 40%);">- * tree, where outer commands are searched via vty_go_parent()</span><br><span style="color: hsl(0, 100%, 40%);">- * and only (!) executed when a matching one is found.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(vty->index);</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 OM2K_CON_GROUP_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = BTS_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- struct con_group *cg = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = cg->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index = bts;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index_sub = &bts->description;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case NAT_BSC_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = NAT_NODE;</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_config *bsc_config = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">- vty->index = bsc_config->nat;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case PGROUP_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = NAT_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 GBPROXY_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case SGSN_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case NAT_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case BSC_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case MSC_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case MNCC_INT_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case NITB_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = CONFIG_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 SUBSCR_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- vty->node = ENABLE_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%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_ss7_vty_go_parent(vty);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return vty->node;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int bsc_vty_is_config_node(struct vty *vty, int node)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- /* Check if libosmo-sccp declares the node in</span><br><span style="color: hsl(0, 100%, 40%);">- * question as config node */</span><br><span style="color: hsl(0, 100%, 40%);">- if (osmo_ss7_is_config_node(vty, node))</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (node) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* add items that are not config */</span><br><span style="color: hsl(0, 100%, 40%);">- case OML_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case OM2K_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case SUBSCR_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- case CONFIG_NODE:</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9701">change 9701</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/9701"/><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: I19f1ece5f2f62d1f8f40a9b9d0c6c41ad05e5c76 </div>
<div style="display:none"> Gerrit-Change-Number: 9701 </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>