kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-13 01:26:58 +00:00
Code Issues Projects Releases Wiki Activity

move sig callback pointer to the span so it can be called from a function

Browse Source 
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@1015 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale
2010-02-01 18:16:13 +00:00
parent f1140c352d
commit 000b7e78b2
14 changed files with 87 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -846,7 +846,6 @@ static switch_status_t channel_receive_message_b(switch_core_session_t *session,
return SWITCH_STATUS_FALSE;
}
zap_mutex_lock(tech_pvt->zchan->mutex);
if (tech_pvt->zchan->state == ZAP_CHANNEL_STATE_TERMINATING) {
zap_mutex_unlock(tech_pvt->zchan->mutex);
return SWITCH_STATUS_SUCCESS;
@@ -902,7 +901,6 @@ static switch_status_t channel_receive_message_b(switch_core_session_t *session,
break;
}
zap_mutex_unlock(tech_pvt->zchan->mutex);
return SWITCH_STATUS_SUCCESS;
}
@@ -992,12 +990,26 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
switch_status_t status;
switch_channel_t *channel;
const char *var;
zap_channel_t *zchan = NULL;
tech_pvt = (private_t *) switch_core_session_get_private(session);
assert(tech_pvt != NULL);
channel = switch_core_session_get_channel(session);
if (!(zchan = tech_pvt->zchan)) {
switch_channel_hangup(channel, SWITCH_CAUSE_LOSE_RACE);
return SWITCH_STATUS_FALSE;
}
zap_mutex_lock(zchan->mutex);
if (!tech_pvt->zchan) {
switch_channel_hangup(channel, SWITCH_CAUSE_LOSE_RACE);
status = SWITCH_STATUS_FALSE;
goto end;
}
switch (msg->message_id) {
case SWITCH_MESSAGE_INDICATE_PROGRESS:
case SWITCH_MESSAGE_INDICATE_ANSWER:
@@ -1038,6 +1050,10 @@ static switch_status_t channel_receive_message(switch_core_session_t *session, s
break;
}
end:
zap_mutex_unlock(zchan->mutex);
return status;
}