March 2009 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r12851 - freeswitch/trunk/src
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 11:10:20 2009 New Revision: 12851 Log: shutdown the queue when destroying the event consumer obj in c++ Modified: freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Mar 31 11:10:20 2009 @@ -97,6 +97,10 @@ switch_event_unbind(&node); } + if (events) { + switch_queue_interrupt_all(events); + } + switch_core_destroy_memory_pool(&pool); }

1 0

[Freeswitch-svn] [commit] r12850 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 08:14:16 2009 New Revision: 12850 Log: MODAPP-240 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Tue Mar 31 08:14:16 2009 @@ -2997,24 +2997,34 @@ } } - switch_channel_get_variables(channel, &vars); - status = deliver_vm(profile, x_user, domain_name, file_path, message_len, read_flags, vars, - switch_core_session_get_pool(session), caller_id_name, caller_id_number, SWITCH_FALSE); - switch_event_destroy(&vars); - if (status == SWITCH_STATUS_SUCCESS) { - if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) { - char *cmd = switch_core_session_sprintf(session, "%s %s %s %s", vm_cc, file_path, caller_id_number, caller_id_name); - if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc); - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc); + switch_event_t *params = NULL; + + switch_event_create(&params, SWITCH_EVENT_REQUEST_PARAMS); + switch_assert(params); + switch_event_add_header_string(params, SWITCH_STACK_BOTTOM, "mailbox", id); + + if (switch_xml_locate_user("id", id, domain_name, switch_channel_get_variable(channel, "network_addr"), + &x_domain_root, &x_domain, &x_user, NULL, params) == SWITCH_STATUS_SUCCESS) { + + switch_channel_get_variables(channel, &vars); + status = deliver_vm(profile, x_user, domain_name, file_path, message_len, read_flags, vars, + switch_core_session_get_pool(session), caller_id_name, caller_id_number, SWITCH_FALSE); + switch_event_destroy(&vars); + if (status == SWITCH_STATUS_SUCCESS) { + if ((vm_cc = switch_channel_get_variable(channel, "vm_cc"))) { + char *cmd = switch_core_session_sprintf(session, "%s %s %s %s", vm_cc, file_path, caller_id_number, caller_id_name); + if (voicemail_inject(cmd) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Sent Carbon Copy to %s\n", vm_cc); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to Carbon Copy to %s\n", vm_cc); + } } + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to deliver message\n"); + TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "deleted", NULL, NULL)); } - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to deliver message\n"); - TRY_CODE(switch_ivr_phrase_macro(session, VM_ACK_MACRO, "deleted", NULL, NULL)); } - + switch_event_destroy(&params); end: if (x_domain_root) {

1 0

[Freeswitch-svn] [commit] r12849 - freeswitch/trunk/src/mod/languages/mod_python
by FreeSWITCH SVN 31 Mar '09

31 Mar '09

Author: anthm Date: Tue Mar 31 08:08:43 2009 New Revision: 12849 Log: MODLANG-109 Modified: freeswitch/trunk/src/mod/languages/mod_python/hack.diff freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Modified: freeswitch/trunk/src/mod/languages/mod_python/hack.diff ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/hack.diff (original) +++ freeswitch/trunk/src/mod/languages/mod_python/hack.diff Tue Mar 31 08:08:43 2009 @@ -1,6 +1,26 @@ ---- mod_python_wrap.cpp 2008-07-16 17:05:18.000000000 -0400 -+++ old.cpp 2008-07-16 17:05:07.000000000 -0400 -@@ -8621,20 +8621,20 @@ +--- mod_python_wrap.cpp.orig 2009-03-21 11:37:16.000000000 +0100 ++++ mod_python_wrap.cpp 2009-03-21 11:33:18.000000000 +0100 +@@ -5469,7 +5469,9 @@ + SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "EventConsumer_pop" "', argument " "2"" of type '" "int""'"); + } + arg2 = static_cast< int >(val2); ++ Py_BEGIN_ALLOW_THREADS; + result = (Event *)(arg1)->pop(arg2); ++ Py_END_ALLOW_THREADS; + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 ); + return resultobj; + fail: +@@ -5491,7 +5493,9 @@ + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_pop" "', argument " "1"" of type '" "EventConsumer *""'"); + } + arg1 = reinterpret_cast< EventConsumer * >(argp1); ++ Py_BEGIN_ALLOW_THREADS; + result = (Event *)(arg1)->pop(); ++ Py_END_ALLOW_THREADS; + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 ); + return resultobj; + fail: +@@ -9206,20 +9210,20 @@ } @@ -24,7 +44,7 @@ PyObject *resultobj = 0; char *arg1 = (char *) 0 ; CoreSession *arg2 = (CoreSession *) 0 ; -@@ -8659,7 +8659,7 @@ +@@ -9244,7 +9248,7 @@ } arg2 = reinterpret_cast< CoreSession * >(argp2); result = (PYTHON::Session *)new PYTHON::Session(arg1,arg2); @@ -33,7 +53,7 @@ if (alloc1 == SWIG_NEWOBJ) delete[] buf1; return resultobj; fail: -@@ -8668,7 +8668,7 @@ +@@ -9253,7 +9257,7 @@ } @@ -42,7 +62,7 @@ PyObject *resultobj = 0; char *arg1 = (char *) 0 ; PYTHON::Session *result = 0 ; -@@ -8684,7 +8684,7 @@ +@@ -9269,7 +9273,7 @@ } arg1 = reinterpret_cast< char * >(buf1); result = (PYTHON::Session *)new PYTHON::Session(arg1); @@ -51,7 +71,7 @@ if (alloc1 == SWIG_NEWOBJ) delete[] buf1; return resultobj; fail: -@@ -8693,7 +8693,7 @@ +@@ -9278,7 +9282,7 @@ } @@ -60,7 +80,7 @@ PyObject *resultobj = 0; switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; PYTHON::Session *result = 0 ; -@@ -8708,7 +8708,7 @@ +@@ -9293,7 +9297,7 @@ } arg1 = reinterpret_cast< switch_core_session_t * >(argp1); result = (PYTHON::Session *)new PYTHON::Session(arg1); Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Tue Mar 31 08:08:43 2009 @@ -5469,7 +5469,9 @@ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "EventConsumer_pop" "', argument " "2"" of type '" "int""'"); } arg2 = static_cast< int >(val2); + Py_BEGIN_ALLOW_THREADS; result = (Event *)(arg1)->pop(arg2); + Py_END_ALLOW_THREADS; resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 ); return resultobj; fail: @@ -5491,7 +5493,9 @@ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "EventConsumer_pop" "', argument " "1"" of type '" "EventConsumer *""'"); } arg1 = reinterpret_cast< EventConsumer * >(argp1); + Py_BEGIN_ALLOW_THREADS; result = (Event *)(arg1)->pop(); + Py_END_ALLOW_THREADS; resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Event, 0 | 0 ); return resultobj; fail:

1 0

[Freeswitch-svn] [commit] r12848 - freeswitch/trunk/scripts
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: mikej Date: Mon Mar 30 17:25:08 2009 New Revision: 12848 Log: typo Modified: freeswitch/trunk/scripts/tagscript-test.sh Modified: freeswitch/trunk/scripts/tagscript-test.sh ============================================================================== --- freeswitch/trunk/scripts/tagscript-test.sh (original) +++ freeswitch/trunk/scripts/tagscript-test.sh Mon Mar 30 17:25:08 2009 @@ -1,7 +1,7 @@ NEW_MICRO=4pre3 -rm -rf freeswitch-1.0.$(NEW_MICRO) -svn co http://svn.freeswitch.org/svn/freeswitch/trunk freeswitch-1.0.$(NEW_MICRO) -cd freeswitch-1.0.$(NEW_MICRO) +rm -rf freeswitch-1.0.$NEW_MICRO +svn co http://svn.freeswitch.org/svn/freeswitch/trunk freeswitch-1.0.$NEW_MICRO +cd freeswitch-1.0.$NEW_MICRO SWITCH_VERSION_MAJOR=`grep SWITCH_VERSION_MAJOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` SWITCH_VERSION_MINOR=`grep SWITCH_VERSION_MINOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` SWITCH_VERSION_MICRO=`grep SWITCH_VERSION_MICRO configure.in | sed "s|.*\[||" | sed "s|\].*||"`

1 0

[Freeswitch-svn] [commit] r12847 - freeswitch/trunk/scripts
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: mikej Date: Mon Mar 30 17:17:26 2009 New Revision: 12847 Log: add tag scripts Added: freeswitch/trunk/scripts/tagscript-test.sh (contents, props changed) freeswitch/trunk/scripts/tagscript.sh (contents, props changed) Added: freeswitch/trunk/scripts/tagscript-test.sh ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/tagscript-test.sh Mon Mar 30 17:17:26 2009 @@ -0,0 +1,18 @@ +NEW_MICRO=4pre3 +rm -rf freeswitch-1.0.$(NEW_MICRO) +svn co http://svn.freeswitch.org/svn/freeswitch/trunk freeswitch-1.0.$(NEW_MICRO) +cd freeswitch-1.0.$(NEW_MICRO) +SWITCH_VERSION_MAJOR=`grep SWITCH_VERSION_MAJOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` +SWITCH_VERSION_MINOR=`grep SWITCH_VERSION_MINOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` +SWITCH_VERSION_MICRO=`grep SWITCH_VERSION_MICRO configure.in | sed "s|.*\[||" | sed "s|\].*||"` +FREESWITCH_VERSION=$((`svnversion .` + 1)) +cat configure.in | sed "s|$SWITCH_VERSION_MICRO|$NEW_MICRO|" | sed "s|svn-revision-here|$FREESWITCH_VERSION|" | sed "s|#AC_SUBST(SWITCH_VERSION_REVISION|AC_SUBST(SWITCH_VERSION_REVISION|" > configure.tmp +cp -f configure.tmp configure.in +rm -f configure.tmp +./bootstrap.sh +rm -f docs/AUTHORS +rm -f docs/COPYING +rm -f docs/ChangeLog +cd .. +tar -czvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.gz freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/ +tar -cjvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.bz2 freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/ Added: freeswitch/trunk/scripts/tagscript.sh ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/tagscript.sh Mon Mar 30 17:17:26 2009 @@ -0,0 +1,34 @@ +NEW_MICRO=4 +rm -rf freeswitch.tag.working +svn co http://svn.freeswitch.org/svn/freeswitch/trunk freeswitch.tag.working +cd freeswitch.tag.working +SWITCH_VERSION_MAJOR=`grep SWITCH_VERSION_MAJOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` +SWITCH_VERSION_MINOR=`grep SWITCH_VERSION_MINOR configure.in | sed "s|.*\[||" | sed "s|\].*||"` +SWITCH_VERSION_MICRO=`grep SWITCH_VERSION_MICRO configure.in | sed "s|.*\[||" | sed "s|\].*||"` +FREESWITCH_VERSION=$((`svnversion .` + 1)) +cat configure.in | sed "s|$SWITCH_VERSION_MICRO|$NEW_MICRO|" | sed "s|svn-revision-here|$FREESWITCH_VERSION|" | sed "s|#AC_SUBST(SWITCH_VERSION_REVISION|AC_SUBST(SWITCH_VERSION_REVISION|" > configure.tmp +cp -f configure.tmp configure.in +rm -f configure.tmp +cd libs/openzap/ +OPENZAP_VERSION=$((`svnversion .` + 1)) +svn copy . http://svn.openzap.org:81/svn/openzap/tags/v$OPENZAP_VERSION -m"tag" +cd ../.. +echo 'cat $1 | sed "s|openzap/trunk|openzap/tags/v'$OPENZAP_VERSION'|" > svn-temp-working' > externaleditor.sh +echo 'cp -f svn-temp-working $1' >> externaleditor.sh +echo 'rm -f svn-temp-working' >> externaleditor.sh +chmod a+x externaleditor.sh +svn propedit svn:externals . --editor-cmd=./externaleditor.sh +svn copy . http://svn.freeswitch.org/svn/freeswitch/tags/$SWITCH_VERSION_MAJOR.$SWITCH… -m"tag" +cd .. +rm -rf freeswitch.tag.working +svn co http://svn.freeswitch.org/svn/freeswitch/tags/$SWITCH_VERSION_MAJOR.$SWITCH… freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO +cd freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO +./bootstrap.sh +rm -rf `find . -name .svn` +rm -f bootstrap.sh +rm -f docs/AUTHORS +rm -f docs/COPYING +rm -f docs/ChangeLog +cd .. +tar -czvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.gz freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/ +tar -cjvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.bz2 freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/

1 0

[Freeswitch-svn] [commit] r12846 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: anthm Date: Mon Mar 30 16:12:06 2009 New Revision: 12846 Log: change blocking rtp to psuedo-blocking to avoid endlessly blocking reads and refactor jitter buffer Modified: freeswitch/trunk/src/switch_apr.c freeswitch/trunk/src/switch_rtp.c Modified: freeswitch/trunk/src/switch_apr.c ============================================================================== --- freeswitch/trunk/src/switch_apr.c (original) +++ freeswitch/trunk/src/switch_apr.c Mon Mar 30 16:12:06 2009 @@ -791,7 +791,13 @@ SWITCH_DECLARE(switch_status_t) switch_poll(switch_pollfd_t *aprset, int32_t numsock, int32_t *nsds, switch_interval_time_t timeout) { - return apr_poll((apr_pollfd_t *)aprset, numsock, nsds, timeout); + apr_status_t st = apr_poll((apr_pollfd_t *)aprset, numsock, nsds, timeout); + + if (st == APR_TIMEUP) { + st = SWITCH_STATUS_TIMEOUT; + } + + return st; } SWITCH_DECLARE(switch_status_t) switch_socket_create_pollfd(switch_pollfd_t **poll, switch_socket_t *sock, int16_t flags, switch_memory_pool_t *pool) Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Mon Mar 30 16:12:06 2009 @@ -129,7 +129,9 @@ * used. */ switch_socket_t *sock_input, *sock_output; - + switch_pollfd_t *read_pollfd; + switch_pollfd_t *jb_pollfd; + switch_sockaddr_t *local_addr; rtp_msg_t send_msg; @@ -188,7 +190,6 @@ switch_timer_t timer; uint8_t ready; uint8_t cn; - switch_time_t last_time; stfu_instance_t *jb; uint32_t max_missed_packets; uint32_t missed_count; @@ -598,6 +599,8 @@ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_USE_TIMER) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK)) { switch_socket_opt_set(rtp_session->sock_input, SWITCH_SO_NONBLOCK, TRUE); switch_set_flag_locked(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); + } else { + switch_socket_create_pollfd(&rtp_session->read_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); } status = SWITCH_STATUS_SUCCESS; @@ -1013,7 +1016,14 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_activate_jitter_buffer(switch_rtp_t *rtp_session, uint32_t queue_frames) { + if (rtp_session->read_pollfd) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't use jitterbuffer without a timer.\n"); + return SWITCH_STATUS_FALSE; + } + rtp_session->jb = stfu_n_init(queue_frames); + switch_socket_create_pollfd(&rtp_session->jb_pollfd, rtp_session->sock_input, SWITCH_POLLIN | SWITCH_POLLERR, rtp_session->pool); + return SWITCH_STATUS_SUCCESS; } @@ -1364,11 +1374,15 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_type, switch_frame_flag_t *flags, switch_io_flag_t io_flags) { switch_size_t bytes = 0; - switch_status_t status; + switch_status_t status = SWITCH_STATUS_SUCCESS, poll_status = SWITCH_STATUS_SUCCESS; int check = 0; stfu_frame_t *jb_frame; int ret = -1; int sleep_mss = 1000; + int poll_sec = 5; + int poll_loop = 0; + int fdr = 0; + int from_jb = 0; if (!switch_rtp_ready(rtp_session)) { return -1; @@ -1376,8 +1390,6 @@ if (rtp_session->timer.interval) { sleep_mss = rtp_session->timer.interval * 1000; - } else { - rtp_session->last_time = switch_time_now(); } READ_INC(rtp_session); @@ -1386,13 +1398,54 @@ int do_cng = 0; if (rtp_session->timer.interval) { - switch_core_timer_next(&rtp_session->timer); + int do_sleep = 1; + if (rtp_session->jb) { + if (switch_poll(rtp_session->jb_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { + do_sleep = 0; + } + } + if (do_sleep) { + switch_core_timer_next(&rtp_session->timer); + } } recvfrom: - bytes = sizeof(rtp_msg_t); - status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + if (rtp_session->jb) { + if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { + memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); + if (jb_frame->plc) { + *flags |= SFF_PLC; + } + bytes = jb_frame->dlen + rtp_header_len; + rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); + rtp_session->recv_msg.header.pt = rtp_session->payload; + from_jb = 1; + goto post_read; + } + } + + + if (rtp_session->read_pollfd) { + poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, poll_sec * 1000000); + } + + + if (poll_status == SWITCH_STATUS_SUCCESS) { + bytes = sizeof(rtp_msg_t); + status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, &bytes); + } else { + if (!SWITCH_STATUS_IS_BREAK(poll_status) && poll_status != SWITCH_STATUS_TIMEOUT) { + ret = -1; + goto end; + } + + poll_loop = 1; + rtp_session->missed_count += (poll_sec * 1000 ) / (rtp_session->ms_per_packet / 1000); + bytes = 0; + } + + post_read: if (bytes < 0) { ret = (int) bytes; @@ -1427,6 +1480,10 @@ continue; } + if (!bytes && poll_loop) { + goto recvfrom; + } + if (bytes && rtp_session->recv_msg.header.m && rtp_session->recv_msg.header.pt != rtp_session->te) { rtp_flush_read_buffer(rtp_session); } @@ -1517,26 +1574,16 @@ goto end; } - if (rtp_session->jb && ((bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) || check)) { + if (rtp_session->jb && !from_jb && ((bytes && rtp_session->recv_msg.header.pt == rtp_session->payload) || check)) { if (bytes) { + if (rtp_session->recv_msg.header.m) { stfu_n_reset(rtp_session->jb); } - stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); + stfu_n_eat(rtp_session->jb, ntohl(rtp_session->recv_msg.header.ts), rtp_session->recv_msg.body, bytes - rtp_header_len); bytes = 0; - } - - if ((jb_frame = stfu_n_read_a_frame(rtp_session->jb))) { - memcpy(rtp_session->recv_msg.body, jb_frame->data, jb_frame->dlen); - if (jb_frame->plc) { - *flags |= SFF_PLC; - } - bytes = jb_frame->dlen + rtp_header_len; - rtp_session->recv_msg.header.ts = htonl(jb_frame->ts); - rtp_session->recv_msg.header.pt = rtp_session->payload; - } else { - goto timer_check; + goto recvfrom; } }

1 0

[Freeswitch-svn] [commit] r12845 - freeswitch/trunk/src/mod/event_handlers/mod_erlang_event
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: andrew Date: Mon Mar 30 16:10:01 2009 New Revision: 12845 Log: Fixed registered process outbound mode (reported by rcpacheco) Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Modified: freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c Mon Mar 30 16:10:01 2009 @@ -417,8 +417,10 @@ ei_get_type(rep->buff, &rep->index, &type, &size); - if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) /* XXX no unicode or character codes > 255 */ + if (type != ERL_STRING_EXT && type != ERL_BINARY_EXT) { /* XXX no unicode or character codes > 255 */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "XML fetch response contained non ASCII characters? (was type %d of size %d)\n", type, size); return NULL; + } if (!(xmlstr = malloc(size + 1))) { @@ -778,7 +780,7 @@ check_log_queue(listener); check_event_queue(listener); - if (SWITCH_STATUS_SUCCESS != check_attached_sessions(listener)) { + if (check_attached_sessions(listener) != SWITCH_STATUS_SUCCESS) { return; } } @@ -1038,6 +1040,7 @@ if (!(session_element = switch_core_session_alloc(session, sizeof(*session_element)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to allocate session element\n"); } else { + memcpy(session_element->uuid_str, switch_core_session_get_uuid(session), SWITCH_UUID_FORMATTED_LENGTH); session_element->process.type = ERLANG_REG_PROCESS; session_element->process.reg_name = switch_core_strdup(switch_core_session_get_pool(session),reg_name); switch_set_flag(session_element, LFLAG_SESSION_ALIVE);

1 0

[Freeswitch-svn] [commit] r12844 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: anthm Date: Mon Mar 30 16:09:49 2009 New Revision: 12844 Log: add warnings Modified: freeswitch/trunk/src/switch_event.c Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Mon Mar 30 16:09:49 2009 @@ -1100,7 +1100,8 @@ SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(const char *file, const char *func, int line, switch_event_t **event, void *user_data) { - + int index; + switch_assert(BLOCK != NULL); switch_assert(RUNTIME_POOL != NULL); switch_assert(EVENT_QUEUE_MUTEX != NULL); @@ -1116,8 +1117,22 @@ (*event)->event_user_data = user_data; } + for (;;) { + for (index = (*event)->priority; index < 3; index++) { + if (switch_queue_trypush(EVENT_QUEUE[index], *event) == SWITCH_STATUS_SUCCESS) { + if (index != (*event)->priority) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "queued event at a lower priority!\n"); + } + goto end; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Event queue is full!\n"); + switch_yield(100000); + } + + end: - switch_queue_push(EVENT_QUEUE[(*event)->priority], *event); *event = NULL; return SWITCH_STATUS_SUCCESS;

1 0

[Freeswitch-svn] [commit] r12843 - freeswitch/trunk
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: mikej Date: Mon Mar 30 13:24:16 2009 New Revision: 12843 Log: add build of fs_ivrd Modified: freeswitch/trunk/Makefile.am Modified: freeswitch/trunk/Makefile.am ============================================================================== --- freeswitch/trunk/Makefile.am (original) +++ freeswitch/trunk/Makefile.am Mon Mar 30 13:24:16 2009 @@ -165,12 +165,15 @@ CLEANFILES = src/include/switch_version.h src/include/switch_swigable_cpp.h BUILT_SOURCES = src/include/switch_version.h src/include/switch_swigable_cpp.h -bin_PROGRAMS = freeswitch fs_cli +bin_PROGRAMS = freeswitch fs_cli fs_ivrd +fs_ivrd_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/ivrd.c fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c freeswitch_SOURCES = src/switch.c nodist_freeswitch_SOURCES = src/include/switch_version.h fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) +fs_ivrd_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include +fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthread $(ESL_LDFLAGS) freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS) freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir) freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la

1 0

[Freeswitch-svn] [commit] r12842 - freeswitch/trunk/src
by FreeSWITCH SVN 30 Mar '09

30 Mar '09

Author: mrene Date: Mon Mar 30 12:48:25 2009 New Revision: 12842 Log: Fix Solaris build Modified: freeswitch/trunk/src/switch_xml_config.c Modified: freeswitch/trunk/src/switch_xml_config.c ============================================================================== --- freeswitch/trunk/src/switch_xml_config.c (original) +++ freeswitch/trunk/src/switch_xml_config.c Mon Mar 30 12:48:25 2009 @@ -336,7 +336,7 @@ case SWITCH_CONFIG_FLAGARRAY: { int8_t *dest = (int8_t*)item->ptr; - int8_t index = (int8_t)(intptr_t)item->data; + unsigned int index = (unsigned int)(intptr_t)item->data; int8_t newval = value ? !!switch_true(value) : (int8_t)((intptr_t)item->defaultvalue); if (dest[index] != newval) { changed = SWITCH_TRUE;

1 0