diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-12-18 11:57:34 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-12-18 11:57:34 -0600 |
| commit | e652a786d6a889848e328a7dd141abd767aca1b6 (patch) | |
| tree | c9b97cb89c8cc07b9314c9f2962ae36927a1538b /main/rtp_engine.c | |
| parent | 03dab00d1d1c115de6ef56ef065b6bf032a70df7 (diff) | |
| parent | a9d6fc571d08de45ac3b9cfb78db9007f7b8ed48 (diff) | |
Merge "json: Audit ast_json_* usage for thread safety." into 13
Diffstat (limited to 'main/rtp_engine.c')
| -rw-r--r-- | main/rtp_engine.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c index 7c5ef311a..6ff8f5286 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -2008,12 +2008,12 @@ static struct ast_json *rtcp_report_to_json(struct stasis_message *msg, } } - json_rtcp_report = ast_json_pack("{s: i, s: i, s: i, s: O, s: O}", + json_rtcp_report = ast_json_pack("{s: i, s: i, s: i, s: o, s: o}", "ssrc", payload->report->ssrc, "type", payload->report->type, "report_count", payload->report->reception_report_count, - "sender_information", json_rtcp_sender_info ? json_rtcp_sender_info : ast_json_null(), - "report_blocks", json_rtcp_report_blocks); + "sender_information", json_rtcp_sender_info ? ast_json_ref(json_rtcp_sender_info) : ast_json_ref(ast_json_null()), + "report_blocks", ast_json_ref(json_rtcp_report_blocks)); if (!json_rtcp_report) { return NULL; } @@ -2025,10 +2025,10 @@ static struct ast_json *rtcp_report_to_json(struct stasis_message *msg, } } - return ast_json_pack("{s: O, s: O, s: O}", - "channel", payload->snapshot ? json_channel : ast_json_null(), - "rtcp_report", json_rtcp_report, - "blob", payload->blob); + return ast_json_pack("{s: o, s: o, s: o}", + "channel", payload->snapshot ? ast_json_ref(json_channel) : ast_json_ref(ast_json_null()), + "rtcp_report", ast_json_ref(json_rtcp_report), + "blob", ast_json_deep_copy(payload->blob)); } static void rtp_rtcp_report_dtor(void *obj) |