res/res_stasis: Fixed wrong StasisEnd timestamp

Because StasisEnd's timestamp created it's own timestamp, it makes
wrong timestamp, compare to other channel event(ChannelDestroyed).
Fixed to getting a timestamp from the Channel's timestamp.

ASTERISK-28333

Change-Id: I5eb8380fc472f1100535a6bc4983c64767026116

diff --git a/res/res_stasis.c b/res/res_stasis.c
index 4b7c3ed74cf2f643c18dc9528adaf68e3ee3e17b..9496fe5b6700909a45992df4e378c01a27b5ed1f 100644 (file)
--- a/res/res_stasis.c
+++ b/res/res_stasis.c
@@ -116,16 +116,23 @@ static struct ast_json *stasis_end_to_json(struct stasis_message *message,
                const struct stasis_message_sanitizer *sanitize)
 {
        struct ast_channel_blob *payload = stasis_message_data(message);
+       struct ast_json *msg;
 
        if (sanitize && sanitize->channel_snapshot &&
                        sanitize->channel_snapshot(payload->snapshot)) {
                return NULL;
        }
 
-       return ast_json_pack("{s: s, s: o, s: o}",
+       msg = ast_json_pack("{s: s, s: O, s: o}",
                "type", "StasisEnd",
-               "timestamp", ast_json_timeval(ast_tvnow(), NULL),
+               "timestamp", ast_json_object_get(payload->blob, "timestamp"),
                "channel", ast_channel_snapshot_to_json(payload->snapshot, sanitize));
+       if (!msg) {
+               ast_log(LOG_ERROR, "Failed to pack JSON for StasisEnd message\n");
+               return NULL;
+       }
+
+       return msg;
 }
 
 STASIS_MESSAGE_TYPE_DEFN_LOCAL(end_message_type,
@@ -1063,7 +1070,10 @@ int app_send_end_msg(struct stasis_app *app, struct ast_channel *chan)
                return 0;
        }
 
-       blob = ast_json_pack("{s: s}", "app", stasis_app_name(app));
+       blob = ast_json_pack("{s: s, s: o}",
+               "app", stasis_app_name(app),
+               "timestamp", ast_json_timeval(ast_tvnow(), NULL)
+               );
        if (!blob) {
                ast_log(LOG_ERROR, "Error packing JSON for StasisEnd message\n");
                return -1;