<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/11133">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Kevin Harwell: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res/res_stasis: Fixed wrong StasisEnd timestamp<br><br>Because StasisEnd's timestamp created it's own timestamp, it makes<br>wrong timestamp, compare to other channel event(ChannelDestroyed).<br>Fixed to getting a timestamp from the Channel's timestamp.<br><br>ASTERISK-28333<br><br>Change-Id: I5eb8380fc472f1100535a6bc4983c64767026116<br>---<br>M res/res_stasis.c<br>1 file changed, 13 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/res/res_stasis.c b/res/res_stasis.c</span><br><span>index c9bbbf3..e040d64 100644</span><br><span>--- a/res/res_stasis.c</span><br><span>+++ b/res/res_stasis.c</span><br><span>@@ -118,16 +118,23 @@</span><br><span>                 const struct stasis_message_sanitizer *sanitize)</span><br><span> {</span><br><span>        struct ast_channel_blob *payload = stasis_message_data(message);</span><br><span style="color: hsl(120, 100%, 40%);">+      struct ast_json *msg;</span><br><span> </span><br><span>    if (sanitize && sanitize->channel_snapshot &&</span><br><span>                     sanitize->channel_snapshot(payload->snapshot)) {</span><br><span>               return NULL;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   return ast_json_pack("{s: s, s: o, s: o}",</span><br><span style="color: hsl(120, 100%, 40%);">+  msg = ast_json_pack("{s: s, s: o, s: o}",</span><br><span>          "type", "StasisEnd",</span><br><span style="color: hsl(0, 100%, 40%);">-                "timestamp", ast_json_timeval(ast_tvnow(), NULL),</span><br><span style="color: hsl(120, 100%, 40%);">+           "timestamp", ast_json_copy(ast_json_object_get(payload->blob, "timestamp")),</span><br><span>          "channel", ast_channel_snapshot_to_json(payload->snapshot, sanitize));</span><br><span style="color: hsl(120, 100%, 40%);">+   if (!msg) {</span><br><span style="color: hsl(120, 100%, 40%);">+           ast_log(LOG_ERROR, "Failed to pack JSON for StasisEnd message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+          return NULL;</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%);">+   return msg;</span><br><span> }</span><br><span> </span><br><span> STASIS_MESSAGE_TYPE_DEFN_LOCAL(end_message_type,</span><br><span>@@ -1034,7 +1041,10 @@</span><br><span>            return 0;</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   blob = ast_json_pack("{s: s}", "app", stasis_app_name(app));</span><br><span style="color: hsl(120, 100%, 40%);">+      blob = ast_json_pack("{s: s, s: o}",</span><br><span style="color: hsl(120, 100%, 40%);">+                "app", stasis_app_name(app),</span><br><span style="color: hsl(120, 100%, 40%);">+                "timestamp", ast_json_timeval(ast_tvnow(), NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+            );</span><br><span>   if (!blob) {</span><br><span>                 ast_log(LOG_ERROR, "Error packing JSON for StasisEnd message\n");</span><br><span>          return -1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/11133">change 11133</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.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.asterisk.org/c/asterisk/+/11133"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-Change-Id: I5eb8380fc472f1100535a6bc4983c64767026116 </div>
<div style="display:none"> Gerrit-Change-Number: 11133 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: sungtae kim <pchero21@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: sungtae kim <pchero21@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>