[Freeswitch-svn] [commit] r9688 - freeswitch/trunk/src/mod/endpoints/mod_sofia

[Freeswitch SVN]

Author: brian
Date: Sat Sep 27 17:41:09 2008
New Revision: 9688

Modified:
   freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
   freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c

Log:
tweak to MODENDP-126 commit

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c	Sat Sep 27 17:41:09 2008
@@ -395,7 +395,6 @@
 		return SWITCH_STATUS_SUCCESS;
 	}
 
-	switch_set_flag_locked(tech_pvt, TFLAG_ANS);
 
 	b_sdp = switch_channel_get_variable(channel, SWITCH_B_SDP_VARIABLE);
 	is_proxy = (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA));
@@ -474,6 +473,8 @@
 				SOATAG_USER_SDP_STR(tech_pvt->local_sdp_str),
 				SOATAG_REUSE_REJECTED(1), SOATAG_ORDERED_USER(1), SOATAG_AUDIO_AUX("cn telephone-event"), NUTAG_INCLUDE_EXTRA_SDP(1), TAG_END());
 
+	switch_set_flag_locked(tech_pvt, TFLAG_ANS);
+
 	return SWITCH_STATUS_SUCCESS;
 }
 

Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c
==============================================================================
--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	(original)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c	Sat Sep 27 17:41:09 2008
@@ -2207,7 +2207,7 @@
 					if (m->m_proto != sdp_proto_srtp) {
 						switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "a=crypto in RTP/AVP\n");
 						match = 0;
-						break;
+						goto done;
 					}
 
 					crypto = attr->a_value;
@@ -2506,7 +2506,8 @@
 			}
 		}
 	}
-
+	
+ done:
 
 	switch_set_flag_locked(tech_pvt, TFLAG_SDP);