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

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12563 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c
index f733eaadb0488e484d377169a0c327d3164e78fe..eb10805379ade4fa5ae4430581fb4692239ffee0 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_glue.c
+++ b/src/mod/endpoints/mod_sofia/sofia_glue.c
@@ -1202,7 +1202,12 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
                        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++;