<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12894">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;">Improve 'show subscriber cache' vty command<br><br>* don't use spaces when printing hex data like RAND, SRES etc to<br>  increase the chance that it'll fit onto single line which will improve<br>  readability<br><br>* don't print non-existent QoS value<br><br>Change-Id: I0a09063f30c1116803994117f49df9d02bcc9181<br>---<br>M src/gprs/sgsn_vty.c<br>1 file changed, 13 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c</span><br><span>index 3757c07..0147b85 100644</span><br><span>--- a/src/gprs/sgsn_vty.c</span><br><span>+++ b/src/gprs/sgsn_vty.c</span><br><span>@@ -749,13 +749,13 @@</span><br><span>                        at->key_seq);</span><br><span>             if (at->vec.auth_types & OSMO_AUTH_TYPE_GSM) {</span><br><span>                        vty_out(vty, "RAND: %s, ",</span><br><span style="color: hsl(0, 100%, 40%);">-                            osmo_hexdump(at->vec.rand,</span><br><span style="color: hsl(120, 100%, 40%);">+                         osmo_hexdump_nospc(at->vec.rand,</span><br><span>                                       sizeof(at->vec.rand)));</span><br><span>                      vty_out(vty, "SRES: %s, ",</span><br><span style="color: hsl(0, 100%, 40%);">-                            osmo_hexdump(at->vec.sres,</span><br><span style="color: hsl(120, 100%, 40%);">+                         osmo_hexdump_nospc(at->vec.sres,</span><br><span>                                       sizeof(at->vec.sres)));</span><br><span>                      vty_out(vty, "Kc: %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">-                              osmo_hexdump(at->vec.kc,</span><br><span style="color: hsl(120, 100%, 40%);">+                           osmo_hexdump_nospc(at->vec.kc,</span><br><span>                                         sizeof(at->vec.kc)), VTY_NEWLINE);</span><br><span>           }</span><br><span>            if (at->vec.auth_types & OSMO_AUTH_TYPE_UMTS) {</span><br><span>@@ -763,19 +763,22 @@</span><br><span>                               osmo_hexdump(at->vec.autn,</span><br><span>                                             sizeof(at->vec.autn)));</span><br><span>                      vty_out(vty, "RES: %s, ",</span><br><span style="color: hsl(0, 100%, 40%);">-                             osmo_hexdump(at->vec.res, at->vec.res_len));</span><br><span style="color: hsl(120, 100%, 40%);">+                            osmo_hexdump_nospc(at->vec.res, at->vec.res_len));</span><br><span>                     vty_out(vty, "IK: %s, ",</span><br><span style="color: hsl(0, 100%, 40%);">-                              osmo_hexdump(at->vec.ik, sizeof(at->vec.ik)));</span><br><span style="color: hsl(120, 100%, 40%);">+                          osmo_hexdump_nospc(at->vec.ik, sizeof(at->vec.ik)));</span><br><span>                   vty_out(vty, "CK: %s, ",</span><br><span style="color: hsl(0, 100%, 40%);">-                              osmo_hexdump(at->vec.ck, sizeof(at->vec.ck)));</span><br><span style="color: hsl(120, 100%, 40%);">+                          osmo_hexdump_nospc(at->vec.ck, sizeof(at->vec.ck)));</span><br><span>           }</span><br><span>    }</span><br><span> </span><br><span>        llist_for_each_entry(pdp, &gsub->sgsn_data->pdp_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">-         vty_out(vty, "    PDP info: Id: %d, Type: 0x%04x, APN: '%s' QoS: %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">-                       pdp->context_id, pdp->pdp_type, pdp->apn_str,</span><br><span style="color: hsl(0, 100%, 40%);">-                  osmo_hexdump(pdp->qos_subscribed, pdp->qos_subscribed_len),</span><br><span style="color: hsl(0, 100%, 40%);">-                       VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+         vty_out(vty, "    PDP info: Id: %d, Type: 0x%04x, APN: '%s'",</span><br><span style="color: hsl(120, 100%, 40%);">+                       pdp->context_id, pdp->pdp_type, pdp->apn_str);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+             if (pdp->qos_subscribed_len)</span><br><span style="color: hsl(120, 100%, 40%);">+                       vty_out(vty, " QoS: %s", osmo_hexdump(pdp->qos_subscribed, pdp->qos_subscribed_len));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+               vty_out(vty, "%s", VTY_NEWLINE);</span><br><span>   }</span><br><span> </span><br><span> #if 0</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12894">change 12894</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/12894"/><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: I0a09063f30c1116803994117f49df9d02bcc9181 </div>
<div style="display:none"> Gerrit-Change-Number: 12894 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </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: Max <msuraev@sysmocom.de> </div>