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

add some options

Browse Source 
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@372 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale
2008-01-25 16:42:06 +00:00
parent c973fadc4e
commit 254c3ed2d8
4 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/freetdm/src/zap_analog.c
View File

@@ -369,6 +369,10 @@ static void *zap_analog_channel_run(zap_thread_t *me, void *obj)
zap_channel_command(zchan, ZAP_COMMAND_GENERATE_RING_OFF, NULL);
}
if (zchan->token_count == 1) {
zap_clear_flag(zchan, ZAP_CHANNEL_HOLD);
}
if (zap_test_flag(zchan, ZAP_CHANNEL_HOLD)) {
zap_clear_flag(zchan, ZAP_CHANNEL_HOLD);
sig.event_id = ZAP_SIGEVENT_ADD_CALL;
@@ -519,7 +523,7 @@ static void *zap_analog_channel_run(zap_thread_t *me, void *obj)
}
if (zap_channel_read(zchan, frame, &len) != ZAP_SUCCESS) {
zap_log(ZAP_LOG_ERROR, "READ ERROR\n");
zap_log(ZAP_LOG_ERROR, "READ ERROR [%s]\n", zchan->last_error);
goto done;
}

10
libs/freetdm/src/zap_zt.c
View File

@@ -654,11 +654,15 @@ ZIO_SPAN_NEXT_EVENT_FUNCTION(zt_next_event)
static ZIO_READ_FUNCTION(zt_read)
{
zap_ssize_t r = 0;
//*datalen = zchan->packet_len;
int errs = 0;
r = read(zchan->sockfd, data, *datalen);
while (errs++ < 100) {
if ((r = read(zchan->sockfd, data, *datalen)) > 0) {
break;
}
}
if (r >= 0) {
if (r > 0) {
*datalen = r;
if (zchan->type == ZAP_CHAN_TYPE_DQ921) {
*datalen -= 2;