<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9724">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;">Add "show gsup-connections" VTY command<br><br>This can help with debugging and give operational insight.<br><br>Change-Id: I977b4b8cdb36dab42b3d736a28d8b5f17cff04cd<br>---<br>M src/hlr_vty.c<br>M tests/test_nodes.vty<br>2 files changed, 35 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr_vty.c b/src/hlr_vty.c</span><br><span>index c10829d..ecc2f5c 100644</span><br><span>--- a/src/hlr_vty.c</span><br><span>+++ b/src/hlr_vty.c</span><br><span>@@ -1,9 +1,10 @@</span><br><span> /* OsmoHLR VTY implementation */</span><br><span> </span><br><span> /* (C) 2016 sysmocom s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(0, 100%, 40%);">- * All Rights Reserved</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span> * Author: Neels Hofmeyr <nhofmeyr@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018 Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span> *</span><br><span> * This program is free software; you can redistribute it and/or modify</span><br><span> * it under the terms of the GNU Affero General Public License as published by</span><br><span>@@ -25,9 +26,11 @@</span><br><span> #include <osmocom/vty/command.h></span><br><span> #include <osmocom/vty/logging.h></span><br><span> #include <osmocom/vty/misc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/abis/ipa.h></span><br><span> </span><br><span> #include "hlr_vty.h"</span><br><span> #include "hlr_vty_subscr.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "gsup_server.h"</span><br><span> </span><br><span> static struct hlr *g_hlr = NULL;</span><br><span> </span><br><span>@@ -75,6 +78,33 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void show_one_conn(struct vty *vty, const struct osmo_gsup_conn *conn)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct ipa_server_conn *isc = conn->conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *name;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gsup_conn_ccm_get(conn, (uint8_t **) &name, IPAC_IDTAG_SERNR);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " '%s' from %s:%5u, CS=%u, PS=%u, 3G_IND=%u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ name, isc->addr, isc->port, conn->supports_cs, conn->supports_ps, conn->auc_3g_ind,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_gsup_conn, show_gsup_conn_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show gsup-connections",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "GSUP Connections from VLRs, SGSNs, EUSEs\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_server *gs = g_hlr->gs;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(conn, &gs->clients, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ show_one_conn(vty, conn);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_hlr_gsup_bind_ip,</span><br><span> cfg_hlr_gsup_bind_ip_cmd,</span><br><span> "bind ip A.B.C.D",</span><br><span>@@ -129,6 +159,8 @@</span><br><span> logging_vty_add_cmds(cat);</span><br><span> osmo_talloc_vty_add_cmds();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_gsup_conn_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> install_element(CONFIG_NODE, &cfg_hlr_cmd);</span><br><span> install_node(&hlr_node, config_write_hlr);</span><br><span> </span><br><span>diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty</span><br><span>index 5afa144..21809c8 100644</span><br><span>--- a/tests/test_nodes.vty</span><br><span>+++ b/tests/test_nodes.vty</span><br><span>@@ -16,6 +16,7 @@</span><br><span> show talloc-context (application|all) (full|brief|DEPTH)</span><br><span> show talloc-context (application|all) (full|brief|DEPTH) tree ADDRESS</span><br><span> show talloc-context (application|all) (full|brief|DEPTH) filter REGEXP</span><br><span style="color: hsl(120, 100%, 40%);">+ show gsup-connections</span><br><span> subscriber (imsi|msisdn|id) IDENT show</span><br><span> </span><br><span> OsmoHLR> enable</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9724">change 9724</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/9724"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I977b4b8cdb36dab42b3d736a28d8b5f17cff04cd </div>
<div style="display:none"> Gerrit-Change-Number: 9724 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </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>