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

add patch to fix stun issue 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4418 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2007-03-01 16:11:08 +00:00
parent 4a2940d81b
commit c612d4226b
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,7 +365,7 @@ static void terminate_session(switch_core_session_t **session, switch_call_cause
static switch_status_t tech_choose_port(private_object_t *tech_pvt);
static void do_invite(switch_core_session_t *session);
static switch_status_t do_invite(switch_core_session_t *session);
static uint8_t negotiate_sdp(switch_core_session_t *session, sdp_session_t *sdp);
@ -889,7 +889,7 @@ static void terminate_session(switch_core_session_t **session, switch_call_cause
tech_pvt = switch_core_session_get_private(*session);
if (tech_pvt) {
if (state > CS_INIT && state < CS_HANGUP) {
if (state < CS_HANGUP) {
switch_channel_hangup(channel, cause);
}
@ -960,7 +960,7 @@ static switch_status_t tech_choose_port(private_object_t *tech_pvt)
return SWITCH_STATUS_SUCCESS;
}
static void do_invite(switch_core_session_t *session)
static switch_status_t do_invite(switch_core_session_t *session)
{
char rpid[1024] = { 0 };
char alert_info[1024] = { 0 };
@ -979,6 +979,7 @@ static void do_invite(switch_core_session_t *session)
void *vval;
char *extra_headers = NULL;
const void *vvar;
switch_status_t status = SWITCH_STATUS_FALSE;
channel = switch_core_session_get_channel(session);
assert(channel != NULL);
@ -1010,7 +1011,7 @@ static void do_invite(switch_core_session_t *session)
}
if (tech_choose_port(tech_pvt) != SWITCH_STATUS_SUCCESS) {
return;
return status;
}
set_local_sdp(tech_pvt, NULL, 0, NULL, 0);
@ -1108,9 +1109,12 @@ static void do_invite(switch_core_session_t *session)
TAG_END());
switch_safe_free(stream.data);
status = SWITCH_STATUS_SUCCESS;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
}
return status;
}
@ -1230,7 +1234,9 @@ static switch_status_t sofia_on_init(switch_core_session_t *session)
}
if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
do_invite(session);
if (do_invite(session) != SWITCH_STATUS_SUCCESS) {
return SWITCH_STATUS_FALSE;
}
}
/* Move Channel's State Machine to RING */

4
src/switch_ivr.c
View File

@ -2795,7 +2795,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
valid_channels++;
state = switch_channel_get_state(peer_channels[i]);
if (state >= CS_RING) {
if (state >= CS_HANGUP) {
goto notready;
} else if (state >= CS_RING) {
goto endfor1;
}