[svn-commits] dvossel: trunk r317920 - in /trunk: ./ res/res_rtp_asterisk.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Fri May  6 16:10:30 2011
New Revision: 317920

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=317920
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/res/res_rtp_asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_rtp_asterisk.c?view=diff&rev=317920&r1=317919&r2=317920
==============================================================================
--- trunk/res/res_rtp_asterisk.c (original)
+++ trunk/res/res_rtp_asterisk.c Fri May  6 16:10:30 2011
@@ -985,7 +985,7 @@
 		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 @@
 					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 @@
 					      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"