<p>keith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/25649">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
dexter: Looks good to me, but someone else must approve
keith: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">VTY: Don't display 'PDP Address: invalid' for IPv4v6<br><br>We were not handling the case of PDP_TYPE_N_IETF_IPv4v6<br>in gprs_pdpaddr2str() and showed "invalid" for these addresses.<br><br>Depends: libosmocore Change-Id: I1f82f9d8fc13dcc4474760329bd74ae9685b9031<br>Change-Id: Id36b7520677e4a0af40d05dc503b26d1b0b74a26<br>---<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/sgsn/sgsn_ctrl.c<br>M src/sgsn/sgsn_vty.c<br>3 files changed, 24 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>index c176494..dcda5c3 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -417,7 +417,7 @@</span><br><span> struct sgsn_instance *sgsn_instance_alloc(void *talloc_ctx);</span><br><span> void sgsn_inst_init(struct sgsn_instance *sgsn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len);</span><br><span style="color: hsl(120, 100%, 40%);">+char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len, bool return_ipv6);</span><br><span> </span><br><span> /*</span><br><span> * ctrl interface related work</span><br><span>diff --git a/src/sgsn/sgsn_ctrl.c b/src/sgsn/sgsn_ctrl.c</span><br><span>index ad91d25..69034e2 100644</span><br><span>--- a/src/sgsn/sgsn_ctrl.c</span><br><span>+++ b/src/sgsn/sgsn_ctrl.c</span><br><span>@@ -43,7 +43,7 @@</span><br><span> </span><br><span> llist_for_each_entry(pdp, &mm->pdp_list, list)</span><br><span> addr = gprs_pdpaddr2str(pdp->lib->eua.v,</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->lib->eua.l);</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->lib->eua.l, false);</span><br><span> </span><br><span> cmd->reply = talloc_asprintf_append(</span><br><span> cmd->reply,</span><br><span>diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c</span><br><span>index e0e2677..6327d1a 100644</span><br><span>--- a/src/sgsn/sgsn_vty.c</span><br><span>+++ b/src/sgsn/sgsn_vty.c</span><br><span>@@ -135,7 +135,7 @@</span><br><span> return osmo_tdef_vty_set_cmd(vty, g_cfg->T_defs, argv);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+char *gprs_pdpaddr2str(uint8_t *pdpa, uint8_t len, bool return_ipv6)</span><br><span> {</span><br><span> static char str[INET6_ADDRSTRLEN + 10];</span><br><span> </span><br><span>@@ -148,15 +148,28 @@</span><br><span> case PDP_TYPE_N_IETF_IPv4:</span><br><span> if (len < 2 + 4)</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- strcpy(str, "IPv4 ");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(str, "IPv4 ", sizeof(str));</span><br><span> inet_ntop(AF_INET, pdpa+2, str+5, sizeof(str)-5);</span><br><span> return str;</span><br><span> case PDP_TYPE_N_IETF_IPv6:</span><br><span> if (len < 2 + 8)</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- strcpy(str, "IPv6 ");</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(str, "IPv6 ", sizeof(str));</span><br><span> inet_ntop(AF_INET6, pdpa+2, str+5, sizeof(str)-5);</span><br><span> return str;</span><br><span style="color: hsl(120, 100%, 40%);">+ case PDP_TYPE_N_IETF_IPv4v6:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (len < 2 + 20)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (return_ipv6) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The IPv6 token, (rightmost four fields) is a duplicate of</span><br><span style="color: hsl(120, 100%, 40%);">+ * the site prefix + subnetID (leftmost fields) in pdpa here */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(str, "IPv6 ", sizeof(str));</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET6, pdpa+6, str+5, sizeof(str)-5);</span><br><span style="color: hsl(120, 100%, 40%);">+ return str;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(str, "IPv4 ", sizeof(str));</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, pdpa+2, str+5, sizeof(str)-5);</span><br><span style="color: hsl(120, 100%, 40%);">+ return str;</span><br><span> default:</span><br><span> break;</span><br><span> }</span><br><span>@@ -552,8 +565,13 @@</span><br><span> osmo_apn_to_str(apnbuf, pdp->lib->apn_use.v, pdp->lib->apn_use.l),</span><br><span> VTY_NEWLINE);</span><br><span> vty_out(vty, "%s PDP Address: %s%s", pfx,</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_pdpaddr2str(pdp->lib->eua.v, pdp->lib->eua.l),</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_pdpaddr2str(pdp->lib->eua.v, pdp->lib->eua.l, false),</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pdp->lib->eua.v[1] == PDP_TYPE_N_IETF_IPv4v6) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s PDP Address: %s%s", pfx,</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_pdpaddr2str(pdp->lib->eua.v, pdp->lib->eua.l, true),</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> vty_out(vty, "%s GTPv%d Local Control(%s / TEIC: 0x%08x) ", pfx, pdp->lib->version,</span><br><span> sgsn_gtp_ntoa(&pdp->lib->gsnlc), pdp->lib->teic_own);</span><br><span> vty_out(vty, "Data(%s / TEID: 0x%08x)%s",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/25649">change 25649</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-sgsn/+/25649"/><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-Change-Id: Id36b7520677e4a0af40d05dc503b26d1b0b74a26 </div>
<div style="display:none"> Gerrit-Change-Number: 25649 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>