From 8726104aa3ffa9f542d0b64b4fb43e6acdcaff77 Mon Sep 17 00:00:00 2001 From: Brian West Date: Wed, 15 Sep 2010 19:46:15 -0500 Subject: [PATCH] If sip_invite_domain is used lets use it for rpid_domain no matter what because I know best if I set it --- src/mod/endpoints/mod_sofia/sofia_glue.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c index 3dd830937a..d17981c9d0 100644 --- a/src/mod/endpoints/mod_sofia/sofia_glue.c +++ b/src/mod/endpoints/mod_sofia/sofia_glue.c @@ -1658,7 +1658,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) sofia_private_t *sofia_private; char *invite_contact = NULL, *to_str, *use_from_str, *from_str; const char *t_var; - char *rpid_domain = "cluecon.com", *p; + char *rpid_domain = NULL, *p; const char *priv = "off"; const char *screen = "no"; const char *invite_params = switch_channel_get_variable(tech_pvt->channel, "sip_invite_params"); @@ -1670,6 +1670,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) const char *from_var = switch_channel_get_variable(tech_pvt->channel, "sip_from_uri"); const char *from_display = switch_channel_get_variable(tech_pvt->channel, "sip_from_display"); const char *invite_req_uri = switch_channel_get_variable(tech_pvt->channel, "sip_invite_req_uri"); + const char *invite_domain = switch_channel_get_variable(tech_pvt->channel, "sip_invite_domain"); const char *use_name, *use_number; if (zstr(tech_pvt->dest)) { @@ -1688,7 +1689,6 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) if (!tech_pvt->from_str) { const char *sipip; const char *format; - const char *alt = NULL; sipip = tech_pvt->profile->sipip; @@ -1698,8 +1698,8 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) format = strchr(sipip, ':') ? "\"%s\" " : "\"%s\" "; - if ((alt = switch_channel_get_variable(channel, "sip_invite_domain"))) { - sipip = alt; + if (!zstr(invite_domain)) { + sipip = invite_domain; } tech_pvt->from_str = switch_core_session_sprintf(tech_pvt->session, format, cid_name, cid_num, !zstr(cid_num) ? "@" : "", sipip); @@ -1739,6 +1739,10 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) } } + if (!zstr(invite_domain)) { + rpid_domain = (char *)invite_domain; + } + if (zstr(rpid_domain)) { rpid_domain = "cluecon.com"; }