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

[FreeSWITCH SVN]

Author: anthm
Date: Wed Mar 11 08:15:02 2009
New Revision: 12563

Log:
still use intended caller id domain in rpid even when from uri is overridden

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

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	Wed Mar 11 08:15:02 2009
@@ -1202,7 +1202,12 @@
 			use_from_str = tech_pvt->from_str;
 		}
 
-		rpid_domain = switch_core_session_strdup(session, use_from_str);
+		if (!switch_strlen_zero(tech_pvt->gateway_from_str)) {
+			rpid_domain = switch_core_session_strdup(session, tech_pvt->gateway_from_str);
+		} else if (!switch_strlen_zero(tech_pvt->from_str)) {
+			rpid_domain = switch_core_session_strdup(session, tech_pvt->from_str);
+		} 
+
 		sofia_glue_get_url_from_contact(rpid_domain, 0);
 		if ((rpid_domain = strrchr(rpid_domain, '@'))) {
 			rpid_domain++;