<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/15359">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: show subscriber: change format of 'last LU seen'<br><br>So far, the time string format comes from ctime_r, and we manually add "UTC" to it.<br><br>The ctime_r format is wildly chaotic IMHO, mixing weekday, day-of-month and<br>hour and year in very unsorted ways.<br><br>Adding "UTC" to it is non-standard.<br><br>Instead use an ISO-8601 standardized time string via strftime().<br><br>Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a<br>---<br>M src/hlr_vty_subscr.c<br>1 file changed, 7 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c</span><br><span>index 14a37f2..8079d10 100644</span><br><span>--- a/src/hlr_vty_subscr.c</span><br><span>+++ b/src/hlr_vty_subscr.c</span><br><span>@@ -36,25 +36,21 @@</span><br><span> </span><br><span> #define hexdump_buf(buf) osmo_hexdump_nospc((void*)buf, sizeof(buf))</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static char *</span><br><span style="color: hsl(0, 100%, 40%);">-get_datestr(const time_t *t, char *datebuf)</span><br><span style="color: hsl(120, 100%, 40%);">+static char *get_datestr(const time_t *t, char *buf, size_t bufsize)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  char *p, *s = ctime_r(t, datebuf);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-      /* Strip trailing newline. */</span><br><span style="color: hsl(0, 100%, 40%);">-   p = strchr(s, '\n');</span><br><span style="color: hsl(0, 100%, 40%);">-    if (p)</span><br><span style="color: hsl(0, 100%, 40%);">-          *p = '\0';</span><br><span style="color: hsl(0, 100%, 40%);">-      return s;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct tm tm;</span><br><span style="color: hsl(120, 100%, 40%);">+ gmtime_r(t, &tm);</span><br><span style="color: hsl(120, 100%, 40%);">+ strftime(buf, bufsize, "%FT%T+00:00", &tm);</span><br><span style="color: hsl(120, 100%, 40%);">+     return buf;</span><br><span> }</span><br><span> </span><br><span> static void dump_last_lu_seen(struct vty *vty, const char *domain_label, time_t last_lu_seen)</span><br><span> {</span><br><span>   uint32_t age;</span><br><span style="color: hsl(0, 100%, 40%);">-   char datebuf[26]; /* for ctime_r(3) */</span><br><span style="color: hsl(120, 100%, 40%);">+        char datebuf[32];</span><br><span>    if (!last_lu_seen)</span><br><span>           return;</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "    last LU seen on %s: %s UTC", domain_label, get_datestr(&last_lu_seen, datebuf));</span><br><span style="color: hsl(120, 100%, 40%);">+      vty_out(vty, "    last LU seen on %s: %s", domain_label, get_datestr(&last_lu_seen, datebuf, sizeof(datebuf)));</span><br><span>        if (!timestamp_age(&last_lu_seen, &age))</span><br><span>             vty_out(vty, " (invalid timestamp)%s", VTY_NEWLINE);</span><br><span>       else</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/15359">change 15359</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-hlr/+/15359"/><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-Change-Id: I6731968f05050399f4dd43b241290186e0c59e1a </div>
<div style="display:none"> Gerrit-Change-Number: 15359 </div>
<div style="display:none"> Gerrit-PatchSet: 29 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>