update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3460 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
dd1f941744
commit
c08e943e44
|
@ -465,8 +465,7 @@ typedef enum {
|
|||
CF_CONTROLLED = (1 << 12),
|
||||
CF_NOMEDIA = (1 << 13),
|
||||
CF_SUSPEND = (1 << 14),
|
||||
CF_EVENT_PARSE = (1 << 15),
|
||||
CF_NO_EARLY = (1 << 16)
|
||||
CF_EVENT_PARSE = (1 << 15)
|
||||
} switch_channel_flag_t;
|
||||
|
||||
|
||||
|
|
|
@ -2548,12 +2548,6 @@ static void sip_i_state(int status,
|
|||
}
|
||||
}
|
||||
if (r_sdp) {
|
||||
if (switch_channel_test_flag(channel, CF_NO_EARLY)) {
|
||||
//ignore 183 but how do we say we dont want it and not end the call
|
||||
//nua_respond(nh, SIP_403_FORBIDDEN, TAG_END());
|
||||
return;
|
||||
}
|
||||
|
||||
if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) {
|
||||
switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
|
||||
switch_channel_set_flag(channel, CF_EARLY_MEDIA);
|
||||
|
|
|
@ -2436,13 +2436,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
|
|||
peer_sessions[i] = NULL;
|
||||
continue;
|
||||
}
|
||||
//switch_channel_set_flag(peer_channels[i], CF_NO_EARLY);
|
||||
|
||||
switch_core_session_read_lock(peer_sessions[i]);
|
||||
pool = NULL;
|
||||
|
||||
peer_channels[i] = switch_core_session_get_channel(peer_sessions[i]);
|
||||
assert(peer_channels[i] != NULL);
|
||||
|
||||
|
||||
if (table == &noop_state_handler) {
|
||||
table = NULL;
|
||||
} else if (!table) {
|
||||
|
|
Loading…
Reference in New Issue