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

fix MODENDP-82 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@408 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale 2008-02-26 22:30:54 +00:00
parent 684c9ec054
commit ec0b259ecf
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/openzap/mod_openzap/mod_openzap.c
View File

@ -752,21 +752,21 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
tech_pvt = (private_t *) switch_core_session_get_private(session);
assert(tech_pvt != NULL);
switch_mutex_lock(tech_pvt->flag_mutex);
switch (tech_pvt->zchan->type) {
case ZAP_CHAN_TYPE_FXS:
status = channel_receive_message_fxs(session, msg);
break;
case ZAP_CHAN_TYPE_FXO:
status = channel_receive_message_fxo(session, msg);
break;
case ZAP_CHAN_TYPE_B:
status = channel_receive_message_b(session, msg);
break;
default:
status = SWITCH_STATUS_FALSE;
break;
}
switch_mutex_unlock(tech_pvt->flag_mutex);
return status;
}

3
libs/openzap/src/zap_analog.c
View File

@ -284,7 +284,8 @@ static void *zap_analog_channel_run(zap_thread_t *me, void *obj)
zap_channel_command(zchan, ZAP_COMMAND_GENERATE_RING_OFF, NULL);
}
if (zap_test_flag(zchan, ZAP_CHANNEL_OFFHOOK) && zchan->last_state >= ZAP_CHANNEL_STATE_IDLE) {
if (zap_test_flag(zchan, ZAP_CHANNEL_OFFHOOK) &&
(zchan->last_state == ZAP_CHANNEL_STATE_RING || zchan->last_state >= ZAP_CHANNEL_STATE_IDLE)) {
zap_set_state_locked(zchan, ZAP_CHANNEL_STATE_BUSY);
} else {
zchan->caller_data.hangup_cause = ZAP_CAUSE_NORMAL_CLEARING;