From b646c2e2e11b0f274bb6748f3237c374f13fde38 Mon Sep 17 00:00:00 2001 From: dvossel Date: Fri, 6 May 2011 21:10:30 +0000 Subject: Merged revisions 317918 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r317918 | dvossel | 2011-05-06 16:06:55 -0500 (Fri, 06 May 2011) | 7 lines Fixes missing colon from To/From headers in RTCP manager events. (closes issue #18221) Reported by: clegall_proformatique Patches: 18221_1.patch uploaded by ebroad (license 878) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317920 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_rtp_asterisk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c index e68d09c18..dd71342d1 100644 --- a/res/res_rtp_asterisk.c +++ b/res/res_rtp_asterisk.c @@ -985,7 +985,7 @@ static int ast_rtcp_write_sr(struct ast_rtp_instance *instance) ast_verbose(" Their last SR: %u\n", rtp->rtcp->themrxlsr); ast_verbose(" DLSR: %4.4f (sec)\n\n", (double)(ntohl(rtcpheader[12])/65536.0)); } - manager_event(EVENT_FLAG_REPORTING, "RTCPSent", "To %s\r\n" + manager_event(EVENT_FLAG_REPORTING, "RTCPSent", "To: %s\r\n" "OurSSRC: %u\r\n" "SentNTP: %u.%010u\r\n" "SentRTP: %u\r\n" @@ -1824,7 +1824,7 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance) ast_verbose(" RTT: %lu(sec)\n", (unsigned long) rtt); } if (rtt) { - manager_event(EVENT_FLAG_REPORTING, "RTCPReceived", "From %s\r\n" + manager_event(EVENT_FLAG_REPORTING, "RTCPReceived", "From: %s\r\n" "PT: %d(%s)\r\n" "ReceptionReports: %d\r\n" "SenderSSRC: %u\r\n" @@ -1849,7 +1849,7 @@ static struct ast_frame *ast_rtcp_read(struct ast_rtp_instance *instance) ntohl(rtcpheader[i + 5])/65536.0, (unsigned long long)rtt); } else { - manager_event(EVENT_FLAG_REPORTING, "RTCPReceived", "From %s\r\n" + manager_event(EVENT_FLAG_REPORTING, "RTCPReceived", "From: %s\r\n" "PT: %d(%s)\r\n" "ReceptionReports: %d\r\n" "SenderSSRC: %u\r\n" -- cgit v1.2.3