[svn-commits] may: branch may/ooh323_ipv6_direct_rtp r364575 - in /team/may/ooh323_ipv6_dir...

[SVN commits to the Digium repositories]

Author: may
Date: Sun Apr 29 02:54:49 2012
New Revision: 364575

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=364575
Log:
Multiple revisions 362919-362920

........
  r362919 | elguero | 2012-04-20 20:50:38 +0400 (Fri, 20 Apr 2012) | 14 lines
  
  Add missing payload type to events API
  
  The Security Events Framework API was changed while adding the generation of
  security events in chan_sip.  A payload type and name was missed from being
  added to struct ie_maps.
  
  (closes issue ASTERISK-19759)
  Reported by: Michael L. Young
  Patches:
      issue-asterisk-19759.diff uploaded by Michael L. Young (license 5026)
  ........
  
  Merged revisions 362918 from http://svn.asterisk.org/svn/asterisk/branches/10
........
  r362920 | rmudgett | 2012-04-20 20:57:09 +0400 (Fri, 20 Apr 2012) | 5 lines
  
  Move debug message in ast_rtp_instance_early_bridge_make_compatible().
  
  Move debug message in ast_rtp_instance_early_bridge_make_compatible() to
  be output when what it states has actually happened.
........

Merged revisions 362919-362920 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/may/ooh323_ipv6_direct_rtp/   (props changed)
    team/may/ooh323_ipv6_direct_rtp/main/event.c
    team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Apr 29 02:54:49 2012
@@ -1,1 +1,1 @@
-/trunk:331201-331202,346391,354429,356042,357272,360190,362888
+/trunk:331201-331202,346391,354429,356042,357272,360190,362888,362919-362920

Propchange: team/may/ooh323_ipv6_direct_rtp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr 29 02:54:49 2012
@@ -1,1 +1,1 @@
-/trunk:1-313481,313483-313906,313908-313943,313945-362884,362888
+/trunk:1-313481,313483-313906,313908-313943,313945-362884,362888,362919-362920

Modified: team/may/ooh323_ipv6_direct_rtp/main/event.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/main/event.c?view=diff&rev=364575&r1=364574&r2=364575
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/main/event.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/main/event.c Sun Apr 29 02:54:49 2012
@@ -267,6 +267,7 @@
 	[AST_EVENT_IE_RECEIVED_CHALLENGE]  = { AST_EVENT_IE_PLTYPE_STR,  "ReceivedChallenge" },
 	[AST_EVENT_IE_RECEIVED_HASH]       = { AST_EVENT_IE_PLTYPE_STR,  "ReceivedHash" },
 	[AST_EVENT_IE_USING_PASSWORD]      = { AST_EVENT_IE_PLTYPE_UINT, "UsingPassword" },
+	[AST_EVENT_IE_ATTEMPTED_TRANSPORT] = { AST_EVENT_IE_PLTYPE_STR,  "AttemptedTransport" },
 
 };
 

Modified: team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c
URL: http://svnview.digium.com/svn/asterisk/team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c?view=diff&rev=364575&r1=364574&r2=364575
==============================================================================
--- team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c (original)
+++ team/may/ooh323_ipv6_direct_rtp/main/rtp_engine.c Sun Apr 29 02:54:49 2012
@@ -1449,7 +1449,6 @@
 	enum ast_rtp_glue_result audio_glue1_res = AST_RTP_GLUE_RESULT_FORBID, video_glue1_res = AST_RTP_GLUE_RESULT_FORBID;
 	struct ast_format_cap *cap0 = ast_format_cap_alloc_nolock();
 	struct ast_format_cap *cap1 = ast_format_cap_alloc_nolock();
-	int res = 0;
 
 	/* Lock both channels so we can look for the glue that binds them together */
 	ast_channel_lock_both(c0, c1);
@@ -1504,7 +1503,11 @@
 	}
 
 	if (glue0->update_peer(c0, instance1, vinstance1, tinstance1, cap1, 0)) {
-		ast_log(LOG_WARNING, "Channel '%s' failed to setup early bridge to '%s'\n", ast_channel_name(c0), c1 ? ast_channel_name(c1) : "<unspecified>");
+		ast_log(LOG_WARNING, "Channel '%s' failed to setup early bridge to '%s'\n",
+			ast_channel_name(c0), ast_channel_name(c1));
+	} else {
+		ast_debug(1, "Seeded SDP of '%s' with that of '%s'\n",
+			ast_channel_name(c0), ast_channel_name(c1));
 	}
 
 	res = 0;
@@ -1528,10 +1531,6 @@
 	unref_instance_cond(&vinstance1);
 	unref_instance_cond(&tinstance0);
 	unref_instance_cond(&tinstance1);
-
-	if (!res) {
-		ast_debug(1, "Seeded SDP of '%s' with that of '%s'\n", ast_channel_name(c0), c1 ? ast_channel_name(c1) : "<unspecified>");
-	}
 }
 
 int ast_rtp_instance_early_bridge(struct ast_channel *c0, struct ast_channel *c1)