[svn-commits] seanbright: branch 1.6.1 r138478 - in /branches/1.6.1: ./ main/rtp.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Sun Aug 17 08:42:59 2008
New Revision: 138478

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138478
Log:
Merged revisions 138476 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r138476 | seanbright | 2008-08-17 09:40:36 -0400 (Sun, 17 Aug 2008) | 7 lines

Add missing colons to RTCPReceived and RTCPSent manager events.

(closes issue #13319)
Reported by: srt
Patches:
      13319_rtcp_manager_event_headers.diff uploaded by srt (license 378)

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/rtp.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Sun Aug 17 08:42:59 2008
@@ -1,1 +1,1 @@
-/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361,138409,138412,138442,138473
+/trunk:1-137647,137680,137732,137780,137812,137848,137933,137987,138024,138028,138086,138124,138148,138155,138207,138260,138311,138361,138409,138412,138442,138473,138476

Modified: branches/1.6.1/main/rtp.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/rtp.c?view=diff&rev=138478&r1=138477&r2=138478
==============================================================================
--- branches/1.6.1/main/rtp.c (original)
+++ branches/1.6.1/main/rtp.c Sun Aug 17 08:42:59 2008
@@ -1329,7 +1329,7 @@
 			}
 
 			if (rtt) {
-				manager_event(EVENT_FLAG_REPORTING, "RTCPReceived", "From %s:%d\r\n"
+				manager_event(EVENT_FLAG_REPORTING, "RTCPReceived", "From: %s:%d\r\n"
 								    "PT: %d(%s)\r\n"
 								    "ReceptionReports: %d\r\n"
 								    "SenderSSRC: %u\r\n"
@@ -1354,7 +1354,7 @@
 								    ntohl(rtcpheader[i + 5])/65536.0,
 								    (unsigned long long)rtt);
 			} else {
-				manager_event(EVENT_FLAG_REPORTING, "RTCPReceived", "From %s:%d\r\n"
+				manager_event(EVENT_FLAG_REPORTING, "RTCPReceived", "From: %s:%d\r\n"
 								    "PT: %d(%s)\r\n"
 								    "ReceptionReports: %d\r\n"
 								    "SenderSSRC: %u\r\n"
@@ -3296,7 +3296,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:%d\r\n"
+	manager_event(EVENT_FLAG_REPORTING, "RTCPSent", "To: %s:%d\r\n"
 					    "OurSSRC: %u\r\n"
 					    "SentNTP: %u.%010u\r\n"
 					    "SentRTP: %u\r\n"