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

FS-9916: [mod_spandsp] OB fax calls go zombie #resolve

This commit is contained in:
Brian West 2017-01-04 16:13:47 -06:00
parent 54483bde7e
commit 4ead2fcffc
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1098,8 +1098,6 @@ static switch_status_t sofia_write_video_frame(switch_core_session_t *session, s
static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id) static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_frame_t **frame, switch_io_flag_t flags, int stream_id)
{ {
private_object_t *tech_pvt = switch_core_session_get_private(session); private_object_t *tech_pvt = switch_core_session_get_private(session);
switch_channel_t *channel = switch_core_session_get_channel(session);
uint32_t sanity = 1000;
switch_status_t status = SWITCH_STATUS_FALSE; switch_status_t status = SWITCH_STATUS_FALSE;
switch_assert(tech_pvt != NULL); switch_assert(tech_pvt != NULL);
@ -1113,18 +1111,10 @@ static switch_status_t sofia_read_frame(switch_core_session_t *session, switch_f
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
while (!(switch_core_media_ready(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO))){// && !switch_channel_test_flag(channel, CF_REQ_MEDIA))) { if (!(switch_core_media_ready(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO))){
switch_ivr_parse_all_messages(tech_pvt->session); return SWITCH_STATUS_INUSE;
if (--sanity && switch_channel_up(channel)) {
switch_yield(10000);
} else {
switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE);
return SWITCH_STATUS_GENERR;
}
} }
sofia_set_flag_locked(tech_pvt, TFLAG_READING); sofia_set_flag_locked(tech_pvt, TFLAG_READING);
if (sofia_test_flag(tech_pvt, TFLAG_HUP) || sofia_test_flag(tech_pvt, TFLAG_BYE)) { if (sofia_test_flag(tech_pvt, TFLAG_HUP) || sofia_test_flag(tech_pvt, TFLAG_BYE)) {
@ -1146,14 +1136,26 @@ static switch_status_t sofia_write_frame(switch_core_session_t *session, switch_
switch_assert(tech_pvt != NULL); switch_assert(tech_pvt != NULL);
while (!(switch_core_media_ready(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO) && !switch_channel_test_flag(channel, CF_REQ_MEDIA))) {
if (switch_channel_ready(channel)) { if (!switch_core_media_ready(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO)) {
switch_yield(10000); if (switch_channel_up_nosig(channel)) {
return SWITCH_STATUS_SUCCESS;
} else { } else {
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
} }
} }
if (switch_channel_test_flag(channel, CF_REQ_MEDIA)) {
if (++tech_pvt->req_media_counter > 2000) {
switch_channel_clear_flag(channel, CF_REQ_MEDIA);
switch_channel_hangup(channel, SWITCH_CAUSE_RECOVERY_ON_TIMER_EXPIRE);
return SWITCH_STATUS_FALSE;
} else {
return SWITCH_STATUS_SUCCESS;
}
} else {
tech_pvt->req_media_counter = 0;
}
if (sofia_test_flag(tech_pvt, TFLAG_HUP)) { if (sofia_test_flag(tech_pvt, TFLAG_HUP)) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;

1
src/mod/endpoints/mod_sofia/mod_sofia.h
View File

@ -855,6 +855,7 @@ struct private_object {
uint32_t sent_invites; uint32_t sent_invites;
uint32_t recv_invites; uint32_t recv_invites;
uint8_t sent_last_invite; uint8_t sent_last_invite;
uint32_t req_media_counter;
}; };