ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 13:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch

Browse Source
This commit is contained in:
Brian West
2014-11-06 18:26:28 -06:00
parent 415f82fe93 60b51c46cc
commit 9e9c4378de
8 changed files with 743 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/endpoints/mod_sofia/mod_sofia.c
+8 -3
View File
@@ -1591,9 +1591,14 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
cseq = sip_cseq_create(nh->nh_home, callsequence, SIP_METHOD_NOTIFY);
nua_handle_bind(nh, &mod_sofia_globals.destroy_private);
from = (char *)switch_channel_get_variable(tech_pvt->channel, "sip_full_to");
to = (char *)switch_channel_get_variable(tech_pvt->channel, "sip_full_from");
if (tech_pvt->sent_last_invite || !tech_pvt->recv_invites) {
from = (char *)switch_channel_get_variable(tech_pvt->channel, "sip_full_from");
to = (char *)switch_channel_get_variable(tech_pvt->channel, "sip_full_to");
} else {
from = (char *)switch_channel_get_variable(tech_pvt->channel, "sip_full_to");
to = (char *)switch_channel_get_variable(tech_pvt->channel, "sip_full_from");
}
nua_info(nh,
TAG_IF(!zstr(tech_pvt->route_uri), NUTAG_PROXY(tech_pvt->route_uri)),
TAG_IF(!zstr(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
src/mod/endpoints/mod_sofia/mod_sofia.h
+2
View File
@@ -810,6 +810,8 @@ struct private_object {
time_t last_vid_info;
uint32_t keepalive;
uint32_t sent_invites;
uint32_t recv_invites;
uint8_t sent_last_invite;
};
src/mod/endpoints/mod_sofia/sofia.c
+4
View File
@@ -6696,6 +6696,8 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
case nua_callstate_authenticating:
break;
case nua_callstate_calling:
tech_pvt->sent_last_invite = 1;
tech_pvt->sent_invites++;
break;
case nua_callstate_proceeding:
@@ -6834,6 +6836,8 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
}
goto done;
case nua_callstate_received:
tech_pvt->recv_invites++;
tech_pvt->sent_last_invite = 0;
if (!sofia_test_flag(tech_pvt, TFLAG_SDP)) {
if (switch_core_session_get_partner(session, &other_session) == SWITCH_STATUS_SUCCESS) {
private_object_t *other_tech_pvt = switch_core_session_get_private(other_session);
src/mod/endpoints/mod_sofia/sofia_glue.c
+1 -1
View File
@@ -1233,7 +1233,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
switch_channel_get_name(tech_pvt->channel), switch_version_full_human(),
tech_pvt->mparams.local_sdp_str ? tech_pvt->mparams.local_sdp_str : "NO SDP PRESENT\n");
tech_pvt->sent_invites++;
if (switch_channel_get_private(tech_pvt->channel, "t38_options")) {
sofia_clear_flag(tech_pvt, TFLAG_ENABLE_SOA);