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

fix regression in previous fix for MODAPP-209 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11663 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-02-06 16:03:56 +00:00
parent de19ef2673
commit a223a59d5e
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/esl/testclient.c
View File

@ -9,7 +9,21 @@ int main(void)
esl_connect(&handle, "localhost", 8021, "ClueCon");
esl_send_recv(&handle, "api status\n\n");
esl_send_recv(&handle, "api conference 3100 play /root/sr8k.raw 1\n\n");
esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3101\n\n");
esl_send_recv(&handle, "api conference 3101 play /root/sr8k.raw 2\n\n");
esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3102\n\n");
esl_send_recv(&handle, "api conference 3102 play /root/sr8k.raw 3\n\n");
esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3103\n\n");
esl_send_recv(&handle, "api conference 3103 play /root/sr8k.raw 4\n\n");
esl_send_recv(&handle, "api uuid_transfer aa1cedb1-5abc-4154-b068-9a0d1be6a7b6 3104\n\n");
esl_disconnect(&handle);

2
scripts/freeswitch-gcore
View File

@ -9,4 +9,4 @@ gcore -o /usr/local/freeswitch/log/freeswitch.gcore $fspid && \
--eval-command='thread apply all bt' \
--eval-command='thread apply all bt full' \
--eval-command='quit'
rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid
#rm /usr/local/freeswitch/log/freeswitch.gcore.$fspid

1
src/mod/applications/mod_conference/mod_conference.c
View File

@ -2181,6 +2181,7 @@ static void *SWITCH_THREAD_FUNC conference_record_thread_run(switch_thread_t *th
switch_mutex_init(&member->control_mutex, SWITCH_MUTEX_NESTED, rec->pool);
switch_mutex_init(&member->flag_mutex, SWITCH_MUTEX_NESTED, rec->pool);
switch_mutex_init(&member->audio_in_mutex, SWITCH_MUTEX_NESTED, rec->pool);
switch_mutex_init(&member->audio_out_mutex, SWITCH_MUTEX_NESTED, rec->pool);