<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14298">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: vty: Require ggsn param in <show pdp-context> cmd<br><br>Other similar commands already do it. This way we also get rid of<br>deprecated APIs, supporting search when more than one GSN is set up.<br><br>Related: OS#2873<br>Change-Id: I8357e20076348c8ded5e9f5b8e7252566b0fbfea<br>---<br>M doc/manuals/vty/ggsn_vty_reference.xml<br>M ggsn/ggsn_vty.c<br>2 files changed, 22 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/manuals/vty/ggsn_vty_reference.xml b/doc/manuals/vty/ggsn_vty_reference.xml</span><br><span>index a226f8f..a395b23 100644</span><br><span>--- a/doc/manuals/vty/ggsn_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/ggsn_vty_reference.xml</span><br><span>@@ -351,10 +351,12 @@</span><br><span> <param name='APN' doc='APN name' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='show pdp-context imsi IMSI [<0-15>]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show pdp-context ggsn NAME imsi IMSI [<0-15>]'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span> <param name='pdp-context' doc='Display information on PDP Context' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='ggsn' doc='Gateway GPRS Support NODE (GGSN)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='NAME' doc='GGSN Name' /></span><br><span> <param name='imsi' doc='PDP contexts for given IMSI' /></span><br><span> <param name='IMSI' doc='PDP context for given NSAPI' /></span><br><span> <param name='[<0-15>]' doc='(null)' /></span><br><span>@@ -709,10 +711,12 @@</span><br><span> <param name='APN' doc='APN name' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(0, 100%, 40%);">- <command id='show pdp-context imsi IMSI [<0-15>]'></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='show pdp-context ggsn NAME imsi IMSI [<0-15>]'></span><br><span> <params></span><br><span> <param name='show' doc='Show running system information' /></span><br><span> <param name='pdp-context' doc='Display information on PDP Context' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='ggsn' doc='Gateway GPRS Support NODE (GGSN)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='NAME' doc='GGSN Name' /></span><br><span> <param name='imsi' doc='PDP contexts for given IMSI' /></span><br><span> <param name='IMSI' doc='PDP context for given NSAPI' /></span><br><span> <param name='[<0-15>]' doc='(null)' /></span><br><span>diff --git a/ggsn/ggsn_vty.c b/ggsn/ggsn_vty.c</span><br><span>index 9101361..eb7cca7 100644</span><br><span>--- a/ggsn/ggsn_vty.c</span><br><span>+++ b/ggsn/ggsn_vty.c</span><br><span>@@ -764,25 +764,35 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(show_pdpctx_imsi, show_pdpctx_imsi_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "show pdp-context imsi IMSI [<0-15>]",</span><br><span style="color: hsl(120, 100%, 40%);">+ "show pdp-context ggsn NAME imsi IMSI [<0-15>]",</span><br><span> SHOW_STR "Display information on PDP Context\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ GGSN_STR "GGSN Name\n"</span><br><span> "PDP contexts for given IMSI\n"</span><br><span> "PDP context for given NSAPI\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- uint64_t imsi = strtoull(argv[0], NULL, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ggsn_ctx *ggsn;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint64_t imsi;</span><br><span> unsigned int nsapi;</span><br><span> struct pdp_t *pdp;</span><br><span> int num_found = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (argc > 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- nsapi = atoi(argv[1]);</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getimsi(&pdp, imsi, nsapi)) {</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%);">+ imsi = strtoull(argv[1], NULL, 10);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (argc > 2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ nsapi = atoi(argv[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getimsi(ggsn->gsn, &pdp, imsi, nsapi)) {</span><br><span> show_one_pdp(vty, pdp);</span><br><span> num_found++;</span><br><span> }</span><br><span> } else {</span><br><span> for (nsapi = 0; nsapi < PDP_MAXNSAPI; nsapi++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getimsi(&pdp, imsi, nsapi))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getimsi(ggsn->gsn, &pdp, imsi, nsapi))</span><br><span> continue;</span><br><span> show_one_pdp(vty, pdp);</span><br><span> num_found++;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14298">change 14298</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/c/osmo-ggsn/+/14298"/><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-Change-Id: I8357e20076348c8ded5e9f5b8e7252566b0fbfea </div>
<div style="display:none"> Gerrit-Change-Number: 14298 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <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: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>