From: Anthony Minessale <anthm@freeswitch.org>
Date: Sun, 20 Jan 2013 18:03:25 +0000 (-0600)
Subject: set controlling when appropriate
X-Git-Tag: v1.5.1~400
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aba03f9e6c92430072803f10cf7e56cee8e8d4d6;p=thirdparty%2Ffreeswitch.git

set controlling when appropriate
---

diff --git a/src/switch_core_media.c b/src/switch_core_media.c
index 634328a0fd..07e327c21b 100644
--- a/src/switch_core_media.c
+++ b/src/switch_core_media.c
@@ -29,6 +29,7 @@
  *
  */
 
+//#define GOOGLE_ICE
 #define RTCP_MUX
 #include <switch.h>
 #include <switch_ssl.h>
@@ -3654,7 +3655,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi
 									ICE_GOOGLE_JINGLE,
 									0
 #else
-									ICE_VANILLA | ICE_CONTROLLED,
+									switch_channel_direction(session->channel) == 
+									SWITCH_CALL_DIRECTION_OUTBOUND ? ICE_VANILLA : ICE_VANILLA | ICE_CONTROLLED,
 									a_engine->ice_in.cands[0].priority
 #endif
 									);
@@ -3700,7 +3702,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi
 											 ICE_GOOGLE_JINGLE,
 											 0
 #else
-											 ICE_VANILLA | ICE_CONTROLLED,
+											 switch_channel_direction(session->channel) == 
+											 SWITCH_CALL_DIRECTION_OUTBOUND ? ICE_VANILLA : ICE_VANILLA | ICE_CONTROLLED,
 											 a_engine->ice_in.cands[1].priority
 #endif
 											 );
@@ -4073,7 +4076,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi
 													 ICE_GOOGLE_JINGLE,
 													 0
 #else
-													 ICE_VANILLA | ICE_CONTROLLED,
+													 switch_channel_direction(session->channel) == 
+													 SWITCH_CALL_DIRECTION_OUTBOUND ? ICE_VANILLA : ICE_VANILLA | ICE_CONTROLLED,
+													 
 													 v_engine->ice_in.cands[1].priority
 #endif
 													 );