kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-25 20:19:36 +00:00
Code Issues Projects Releases Wiki Activity

fix OPENZAP-14

Browse Source 
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@553 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale 2008-09-10 19:27:17 +00:00
parent fa8457c019
commit 6d024dc60e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1824,7 +1824,7 @@ SWITCH_STANDARD_API(oz_function)
int j; int j;
stream->write_function(stream, "+OK\n"); stream->write_function(stream, "+OK\n");
for(j = 0; j <= span->chan_count; j++) { for(j = 1; j <= span->chan_count; j++) {
dump_chan(span, j, stream); dump_chan(span, j, stream);
} }

9
libs/openzap/src/zap_io.c
View File

@ -345,7 +345,7 @@ zap_status_t zap_span_close_all(void)
for(i = 1; i <= globals.span_index; i++) { for(i = 1; i <= globals.span_index; i++) {
span = globals.spans[i]; span = globals.spans[i];
if (zap_test_flag(span, ZAP_SPAN_CONFIGURED)) { if (zap_test_flag(span, ZAP_SPAN_CONFIGURED)) {
for(j = 0; j <= span->chan_count && span->channels[j]; j++) { for(j = 1; j <= span->chan_count && span->channels[j]; j++) {
zap_channel_destroy(span->channels[j]); zap_channel_destroy(span->channels[j]);
} }
} }
@ -429,6 +429,7 @@ zap_status_t zap_span_add_channel(zap_span_t *span, zap_socket_t sockfd, zap_cha
return ZAP_FAIL; return ZAP_FAIL;
} }
span->channels[span->chan_count] = new_chan; span->channels[span->chan_count] = new_chan;
memset(new_chan, 0, sizeof(*new_chan));
} }
new_chan->type = type; new_chan->type = type;
@ -869,7 +870,11 @@ zap_status_t zap_channel_open_any(uint32_t span_id, zap_direction_t direction, z
} }
} }
check = span->channels[i]; if (!(check = span->channels[i])) {
status = ZAP_FAIL;
zap_mutex_unlock(span->mutex);
goto done;
}
if (zap_test_flag(check, ZAP_CHANNEL_READY) && if (zap_test_flag(check, ZAP_CHANNEL_READY) &&
!zap_test_flag(check, ZAP_CHANNEL_INUSE) && !zap_test_flag(check, ZAP_CHANNEL_INUSE) &&