<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14010">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: 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;">osmo-ggsn: add VTY command to show PDP context by IPv4<br><br>Change-Id: Iad60de34c562803a1a1fc024287d1a60e071afab<br>---<br>M ggsn/ggsn_vty.c<br>1 file changed, 42 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c</span><br><span>index f55bd9b..594c0e9 100644</span><br><span>--- a/ggsn/ggsn_vty.c</span><br><span>+++ b/ggsn/ggsn_vty.c</span><br><span>@@ -781,6 +781,47 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(show_pdpctx_ip, show_pdpctx_ip_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show pdp-context ggsn NAME ipv4 A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ SHOW_STR "Display information on PDP Context\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ GGSN_STR "GGSN Name\n" "IPv4 address type\n" "IP address\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ggsn_ctx *ggsn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct apn_ctx *apn;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ggsn = ggsn_find(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ggsn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No such GGSN '%s'%s", argv[0], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</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%);">+ /* Iterate over all APNs of a given GGSN */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(apn, &ggsn->apn_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ippool_t *pool = apn->v4.pool;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* In some rare cases, if GGSN fails to init TUN/TAP interfaces</span><br><span style="color: hsl(120, 100%, 40%);">+ * (e.g. due to insufficient permissions), it will continue to</span><br><span style="color: hsl(120, 100%, 40%);">+ * work in such broken state, and pool would be NULL. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pool)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Iterate over all IPv4 pool members */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < pool->listsize; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ippoolm_t *member = &pool->member[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (member->inuse == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(argv[1], in46a_ntoa(&member->addr)) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ show_one_pdp(vty, member->peer);</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 style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No PDP context found for IP '%s'%s", argv[1], VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* show all (active) PDP contexts within a pool */</span><br><span> static void ippool_show_pdp_contexts(struct vty *vty, struct ippool_t *pool)</span><br><span> {</span><br><span>@@ -898,6 +939,7 @@</span><br><span> install_element_ve(&show_pdpctx_apn_cmd);</span><br><span> install_element_ve(&show_deprecated_pdpctx_apn_cmd);</span><br><span> install_element_ve(&show_pdpctx_imsi_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element_ve(&show_pdpctx_ip_cmd);</span><br><span> install_element_ve(&show_ggsn_cmd);</span><br><span> </span><br><span> install_element(CONFIG_NODE, &cfg_ggsn_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14010">change 14010</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/14010"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iad60de34c562803a1a1fc024287d1a60e071afab </div>
<div style="display:none"> Gerrit-Change-Number: 14010 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>