[asterisk-commits] trunk r33108 - /trunk/rtp.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Jun  8 15:05:36 2006
New Revision: 33108

URL: http://svn.digium.com/view/asterisk?rev=33108&view=rev
Log:
Avoid using the name "early media" for media that is not early

Modified:
    trunk/rtp.c

Modified: trunk/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/rtp.c?rev=33108&r1=33107&r2=33108&view=diff
==============================================================================
--- trunk/rtp.c (original)
+++ trunk/rtp.c Thu Jun  8 15:05:36 2006
@@ -1221,6 +1221,7 @@
 	struct ast_rtp *vdestp, *vsrcp=NULL;		/* Video RTP channels */
 	struct ast_rtp_protocol *destpr, *srcpr=NULL;
 	int srccodec;
+
 	/* Lock channels */
 	ast_channel_lock(dest);
 	if (src) {
@@ -1275,14 +1276,14 @@
 	/* Consider empty media as non-existant */
 	if (srcp && !srcp->them.sin_addr.s_addr)
 		srcp = NULL;
-	/* Bridge early media */
+	/* Bridge media early */
 	if (destpr->set_rtp_peer(dest, srcp, vsrcp, srccodec, srcp ? ast_test_flag(srcp, FLAG_NAT_ACTIVE) : 0))
-		ast_log(LOG_WARNING, "Channel '%s' failed to send early media to '%s'\n", dest->name, src ? src->name : "<unspecified>");
+		ast_log(LOG_WARNING, "Channel '%s' failed to setup early bridge to '%s'\n", dest->name, src ? src->name : "<unspecified>");
 	ast_channel_unlock(dest);
 	if (src)
 		ast_channel_unlock(src);
 	if (option_debug)
-		ast_log(LOG_DEBUG, "Setting early  media SDP of '%s' with that of '%s'\n", dest->name, src ? src->name : "<unspecified>");
+		ast_log(LOG_DEBUG, "Setting early bridge SDP of '%s' with that of '%s'\n", dest->name, src ? src->name : "<unspecified>");
 	return 1;
 }
 
@@ -1339,9 +1340,9 @@
 	else
 		srccodec = 0;
 	if (media) {
-		/* Bridge early media */
+		/* Bridge early */
 		if (destpr->set_rtp_peer(dest, srcp, vsrcp, srccodec, ast_test_flag(srcp, FLAG_NAT_ACTIVE)))
-			ast_log(LOG_WARNING, "Channel '%s' failed to send early media to '%s'\n", dest->name, src->name);
+			ast_log(LOG_WARNING, "Channel '%s' failed to setup early bridge to '%s'\n", dest->name, src->name);
 	}
 	ast_channel_unlock(dest);
 	ast_channel_unlock(src);