kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add vars 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3455 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-11-25 16:35:56 +00:00
parent 757d26b382
commit 2580c41f82
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -3930,8 +3930,8 @@ static void sip_i_invite(nua_t *nua,
char *displayname; char *displayname;
char *username, *to_username = NULL; char *username, *to_username = NULL;
char *url_user = (char *) from->a_url->url_user; char *url_user = (char *) from->a_url->url_user;
char *to_user, *to_host; char *to_user, *to_host, *to_port;
if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) { if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__); terminate_session(&session, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER, __LINE__);
@ -3944,6 +3944,9 @@ static void sip_i_invite(nua_t *nua,
to_user = (char *) to->a_url->url_user; to_user = (char *) to->a_url->url_user;
to_host = (char *) to->a_url->url_host; to_host = (char *) to->a_url->url_host;
if (!(to_port = (char *) to->a_url->url_port)) {
to_port = "5060";
}
if (switch_strlen_zero(to_user)) { /* if sofia doesnt parse the To: right, we'll have to do it */ if (switch_strlen_zero(to_user)) { /* if sofia doesnt parse the To: right, we'll have to do it */
if ((to_user = sip_header_as_string(tech_pvt->home, (sip_header_t *) to))) { if ((to_user = sip_header_as_string(tech_pvt->home, (sip_header_t *) to))) {
@ -3985,7 +3988,7 @@ static void sip_i_invite(nua_t *nua,
} }
if (profile->pflags & PFLAG_FULL_ID) { if (profile->pflags & PFLAG_FULL_ID) {
if (!(to_username = switch_mprintf("%s@%s", (char *) to_user, (char *) to_host))) { if (!(to_username = switch_mprintf("%s@%s:%s", (char *) to_user, (char *) to_host, to_port))) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
switch_safe_free(username); switch_safe_free(username);
return; return;
@ -4006,6 +4009,11 @@ static void sip_i_invite(nua_t *nua,
switch_channel_set_variable(channel, "sip_from_user_stripped", (char *)from->a_url->url_user); switch_channel_set_variable(channel, "sip_from_user_stripped", (char *)from->a_url->url_user);
} }
switch_channel_set_variable(channel, "sip_from_host", (char *) from->a_url->url_host); switch_channel_set_variable(channel, "sip_from_host", (char *) from->a_url->url_host);
switch_channel_set_variable(channel, "sip_from_port", (char *) from->a_url->url_port);
switch_channel_set_variable(channel, "sip_to_user", (char *) to_user);
switch_channel_set_variable(channel, "sip_to_host", to_host);
switch_channel_set_variable(channel, "sip_to_port", (char *) to_port);
if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session), if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
(char *) from->a_url->url_user, (char *) from->a_url->url_user,
profile->dialplan, profile->dialplan,