May 2009 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r13290 - freeswitch/trunk/libs/apr-util
by FreeSWITCH SVN 13 May '09

13 May '09

Author: mikej Date: Wed May 13 10:58:42 2009 New Revision: 13290 Log: add xml/expat stuff back to apr-utils (will require re-bootstrap before building anything that uses this) Modified: freeswitch/trunk/libs/apr-util/.update freeswitch/trunk/libs/apr-util/configure.gnu Modified: freeswitch/trunk/libs/apr-util/.update ============================================================================== --- freeswitch/trunk/libs/apr-util/.update (original) +++ freeswitch/trunk/libs/apr-util/.update Wed May 13 10:58:42 2009 @@ -1 +1 @@ -Wed May 13 10:45:16 CDT 2009 +Wed May 13 10:54:08 CDT 2009 Modified: freeswitch/trunk/libs/apr-util/configure.gnu ============================================================================== --- freeswitch/trunk/libs/apr-util/configure.gnu (original) +++ freeswitch/trunk/libs/apr-util/configure.gnu Wed May 13 10:58:42 2009 @@ -1,3 +1,3 @@ #! /bin/sh -./configure "$@" --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3 +./configure "$@" --with-apr=../apr --disable-shared --with-pic --without-sqlite2 --without-sqlite3 --with-expat=builtin

1 0

[commit] r13289 - freeswitch/trunk/libs/apr-util
by FreeSWITCH SVN 13 May '09

13 May '09

Author: mikej Date: Wed May 13 10:46:01 2009 New Revision: 13289 Log: add xml/expat stuff back to apr-utils (will require re-bootstrap before building anything that uses this) Modified: freeswitch/trunk/libs/apr-util/.update freeswitch/trunk/libs/apr-util/build-outputs.mk freeswitch/trunk/libs/apr-util/build.conf freeswitch/trunk/libs/apr-util/configure.in Modified: freeswitch/trunk/libs/apr-util/.update ============================================================================== --- freeswitch/trunk/libs/apr-util/.update (original) +++ freeswitch/trunk/libs/apr-util/.update Wed May 13 10:46:01 2009 @@ -1 +1 @@ -Thu May 8 18:41:57 EDT 2008 +Wed May 13 10:45:16 CDT 2009 Modified: freeswitch/trunk/libs/apr-util/build-outputs.mk ============================================================================== --- freeswitch/trunk/libs/apr-util/build-outputs.mk (original) +++ freeswitch/trunk/libs/apr-util/build-outputs.mk Wed May 13 10:46:01 2009 @@ -13,10 +13,11 @@ misc/apu_version.lo: misc/apu_version.c .make.dirs include/apu_version.h misc/apr_queue.lo: misc/apr_queue.c .make.dirs include/apr_queue.h uri/apr_uri.lo: uri/apr_uri.c .make.dirs include/apr_uri.h +xml/apr_xml.lo: xml/apr_xml.c .make.dirs include/apr_xml.h include/apr_xlate.h strmatch/apr_strmatch.lo: strmatch/apr_strmatch.c .make.dirs include/apr_strmatch.h xlate/xlate.lo: xlate/xlate.c .make.dirs include/apr_xlate.h -OBJECTS_all = crypto/apr_md5.lo crypto/uuid.lo crypto/apr_sha1.lo crypto/getuuid.lo crypto/apr_md4.lo encoding/apr_base64.lo hooks/apr_hooks.lo misc/apr_reslist.lo misc/apr_rmm.lo misc/apr_date.lo misc/apu_version.lo misc/apr_queue.lo uri/apr_uri.lo strmatch/apr_strmatch.lo xlate/xlate.lo +OBJECTS_all = crypto/apr_md5.lo crypto/uuid.lo crypto/apr_sha1.lo crypto/getuuid.lo crypto/apr_md4.lo encoding/apr_base64.lo hooks/apr_hooks.lo misc/apr_reslist.lo misc/apr_rmm.lo misc/apr_date.lo misc/apu_version.lo misc/apr_queue.lo uri/apr_uri.lo xml/apr_xml.lo strmatch/apr_strmatch.lo xlate/xlate.lo OBJECTS_unix = $(OBJECTS_all) @@ -28,11 +29,11 @@ OBJECTS_os390 = $(OBJECTS_all) -HEADERS = $(top_srcdir)/include/apr_optional.h $(top_srcdir)/include/apu_version.h $(top_srcdir)/include/apr_strmatch.h $(top_srcdir)/include/apr_optional_hooks.h $(top_srcdir)/include/apr_sdbm.h $(top_srcdir)/include/apr_md4.h $(top_srcdir)/include/apr_reslist.h $(top_srcdir)/include/apr_base64.h $(top_srcdir)/include/apr_anylock.h $(top_srcdir)/include/apr_rmm.h $(top_srcdir)/include/apr_md5.h $(top_srcdir)/include/apr_date.h $(top_srcdir)/include/apr_hooks.h $(top_srcdir)/include/apr_xlate.h $(top_srcdir)/include/apr_queue.h $(top_srcdir)/include/apr_uri.h $(top_srcdir)/include/apr_uuid.h $(top_srcdir)/include/apr_sha1.h +HEADERS = $(top_srcdir)/include/apr_optional.h $(top_srcdir)/include/apu_version.h $(top_srcdir)/include/apr_strmatch.h $(top_srcdir)/include/apr_optional_hooks.h $(top_srcdir)/include/apr_sdbm.h $(top_srcdir)/include/apr_md4.h $(top_srcdir)/include/apr_reslist.h $(top_srcdir)/include/apr_base64.h $(top_srcdir)/include/apr_xml.h $(top_srcdir)/include/apr_anylock.h $(top_srcdir)/include/apr_rmm.h $(top_srcdir)/include/apr_md5.h $(top_srcdir)/include/apr_date.h $(top_srcdir)/include/apr_hooks.h $(top_srcdir)/include/apr_xlate.h $(top_srcdir)/include/apr_queue.h $(top_srcdir)/include/apr_uri.h $(top_srcdir)/include/apr_uuid.h $(top_srcdir)/include/apr_sha1.h -SOURCE_DIRS = encoding hooks misc crypto uri strmatch xlate $(EXTRA_SOURCE_DIRS) +SOURCE_DIRS = xml encoding hooks misc crypto uri strmatch xlate $(EXTRA_SOURCE_DIRS) -BUILD_DIRS = crypto encoding hooks misc strmatch uri xlate +BUILD_DIRS = crypto encoding hooks misc strmatch uri xlate xml .make.dirs: $(srcdir)/build-outputs.mk @for d in $(BUILD_DIRS); do test -d $$d || mkdir $$d; done Modified: freeswitch/trunk/libs/apr-util/build.conf ============================================================================== --- freeswitch/trunk/libs/apr-util/build.conf (original) +++ freeswitch/trunk/libs/apr-util/build.conf Wed May 13 10:46:01 2009 @@ -15,10 +15,10 @@ ldap/*.c misc/*.c uri/apr_uri.c + xml/*.c strmatch/*.c xlate/*.c dbd/*.c -# xml/*.c # we have no platform-specific subdirs platform_dirs = Modified: freeswitch/trunk/libs/apr-util/configure.in ============================================================================== --- freeswitch/trunk/libs/apr-util/configure.in (original) +++ freeswitch/trunk/libs/apr-util/configure.in Wed May 13 10:46:01 2009 @@ -122,7 +122,7 @@ APU_CHECK_DBD_MYSQL APU_CHECK_DBD_SQLITE3 APU_CHECK_DBD_SQLITE2 -#APU_FIND_EXPAT +APU_FIND_EXPAT APU_FIND_ICONV AC_SEARCH_LIBS(crypt, crypt ufc)

1 0

[commit] r13288 - freeswitch/trunk/build/config
by FreeSWITCH SVN 12 May '09

12 May '09

Author: andrew Date: Tue May 12 15:00:49 2009 New Revision: 13288 Log: Fix erlang autoconf macro to deal with crazy things being in ~/.erlang (MODEVENT-45) Modified: freeswitch/trunk/build/config/erlang.m4 Modified: freeswitch/trunk/build/config/erlang.m4 ============================================================================== --- freeswitch/trunk/build/config/erlang.m4 (original) +++ freeswitch/trunk/build/config/erlang.m4 Tue May 12 15:00:49 2009 @@ -34,7 +34,7 @@ fi AC_MSG_RESULT([$ERLANG_VER]) - ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt` + ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1` AC_MSG_CHECKING([erlang libdir]) if test -z "`echo $ERLANG_LIBDIR`" ; then AC_MSG_ERROR([failed]) @@ -44,7 +44,7 @@ fi AC_MSG_RESULT([$ERLANG_LIBDIR]) - ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt` + ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1` AC_MSG_CHECKING([erlang incdir]) if test -z "`echo $ERLANG_INCDIR`" ; then AC_MSG_ERROR([failed])

1 0

[commit] r13287 - in freeswitch/trunk/src: . include
by FreeSWITCH SVN 12 May '09

12 May '09

Author: anthm Date: Tue May 12 12:10:57 2009 New Revision: 13287 Log: accept asterisk N/X/Z/. notation everywhere regexes are expected when they start with _ Modified: freeswitch/trunk/src/include/switch_utils.h freeswitch/trunk/src/switch_regex.c freeswitch/trunk/src/switch_utils.c Modified: freeswitch/trunk/src/include/switch_utils.h ============================================================================== --- freeswitch/trunk/src/include/switch_utils.h (original) +++ freeswitch/trunk/src/include/switch_utils.h Tue May 12 12:10:57 2009 @@ -514,7 +514,7 @@ SWITCH_DECLARE(const char *) switch_stristr(const char *instr, const char *str); SWITCH_DECLARE(switch_bool_t) switch_is_lan_addr(const char *ip); SWITCH_DECLARE(char *) switch_replace_char(char *str, char from, char to, switch_bool_t dup); -SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len); +SWITCH_DECLARE(switch_bool_t) switch_ast2regex(const char *pat, char *rbuf, size_t len); /*! \brief Escape a string by prefixing a list of characters with an escape character Modified: freeswitch/trunk/src/switch_regex.c ============================================================================== --- freeswitch/trunk/src/switch_regex.c (original) +++ freeswitch/trunk/src/switch_regex.c Tue May 12 12:10:57 2009 @@ -60,11 +60,18 @@ int match_count = 0; char *tmp = NULL; uint32_t flags = 0; + char abuf[256] = ""; if (!(field && expression)) { return 0; } + if (*expression == '_') { + if (switch_ast2regex(expression + 1, abuf, sizeof(abuf))) { + expression = abuf; + } + } + if (*expression == '/') { char *opts = NULL; tmp = strdup(expression + 1); Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Tue May 12 12:10:57 2009 @@ -565,9 +565,9 @@ )? SWITCH_FALSE : SWITCH_TRUE; } -SWITCH_DECLARE(switch_bool_t) switch_ast2regex(char *pat, char *rbuf, size_t len) +SWITCH_DECLARE(switch_bool_t) switch_ast2regex(const char *pat, char *rbuf, size_t len) { - char *p = pat; + const char *p = pat; if (!pat) { return SWITCH_FALSE;

1 0

[commit] r13286 - freeswitch/trunk/src
by FreeSWITCH SVN 12 May '09

12 May '09

Author: anthm Date: Tue May 12 11:46:16 2009 New Revision: 13286 Log: FSCORE-365 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 Tue May 12 11:46:16 2009 @@ -786,15 +786,23 @@ SWITCH_DECLARE(switch_status_t) switch_pollset_add(switch_pollset_t *pollset, const switch_pollfd_t *descriptor) { + if (!pollset) { + return SWITCH_STATUS_FALSE; + } + return apr_pollset_add((apr_pollset_t *)pollset, (const apr_pollfd_t *)descriptor); } SWITCH_DECLARE(switch_status_t) switch_poll(switch_pollfd_t *aprset, int32_t numsock, int32_t *nsds, switch_interval_time_t timeout) { - apr_status_t st = apr_poll((apr_pollfd_t *)aprset, numsock, nsds, timeout); - - if (st == APR_TIMEUP) { - st = SWITCH_STATUS_TIMEOUT; + apr_status_t st = SWITCH_STATUS_FALSE; + + if (aprset) { + st = apr_poll((apr_pollfd_t *)aprset, numsock, nsds, timeout); + + if (st == APR_TIMEUP) { + st = SWITCH_STATUS_TIMEOUT; + } } return st; Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Tue May 12 11:46:16 2009 @@ -1475,7 +1475,8 @@ int do_cng = 0; if (rtp_session->timer.interval) { - if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) { + if ((switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) && + rtp_session->read_pollfd) { if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 1) == SWITCH_STATUS_SUCCESS) { hot_socket = 1; } @@ -1487,7 +1488,7 @@ recvfrom: - if (!rtp_session->timer.interval) { + if (!rtp_session->timer.interval && rtp_session->read_pollfd) { poll_status = switch_poll(rtp_session->read_pollfd, 1, &fdr, poll_sec * 1000000); }

1 0

[commit] r13285 - freeswitch/trunk/src
by FreeSWITCH SVN 12 May '09

12 May '09

Author: anthm Date: Tue May 12 09:54:34 2009 New Revision: 13285 Log: FSCORE-357 Modified: freeswitch/trunk/src/switch_channel.c freeswitch/trunk/src/switch_ivr_originate.c Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Tue May 12 09:54:34 2009 @@ -796,7 +796,7 @@ uint32_t to, switch_channel_t *super_channel) { - + if (to) { to++; } @@ -2314,6 +2314,12 @@ char dtstr[SWITCH_DTMF_LOG_LEN+1] = ""; int x = 0; + if (switch_channel_test_flag(channel, CF_TIMESTAMP_SET)) { + return SWITCH_STATUS_FALSE; + } + + switch_channel_set_flag(channel, CF_TIMESTAMP_SET); + if (!(caller_profile = switch_channel_get_caller_profile(channel)) || !channel->variables) { return SWITCH_STATUS_FALSE; } @@ -2506,8 +2512,6 @@ switch_snprintf(tmp, sizeof(tmp), "%" SWITCH_TIME_T_FMT, legbillusec); switch_channel_set_variable(channel, "flow_billusec", tmp); - - switch_channel_set_flag(channel, CF_TIMESTAMP_SET); return status; } Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue May 12 09:54:34 2009 @@ -2056,16 +2056,12 @@ channel = switch_core_session_get_channel(originate_status[i].peer_session); - switch_channel_wait_for_flag(channel, - CF_TIMESTAMP_SET, - SWITCH_TRUE, - 5000, - NULL); - - if (!switch_channel_test_flag(channel, CF_TIMESTAMP_SET) || !switch_core_session_running(originate_status[i].peer_session)) { - switch_core_session_reporting_state(originate_status[i].peer_session); + switch_channel_wait_for_state_timeout(channel, CS_REPORTING, 5000); + + if (!switch_channel_test_flag(channel, CF_TIMESTAMP_SET)) { + switch_channel_set_timestamps(channel); } - + if (switch_ivr_generate_xml_cdr(originate_status[i].peer_session, &cdr) == SWITCH_STATUS_SUCCESS) { if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { switch_snprintf(buf, sizeof(buf), "%s_%d", cdr_var, ++cdr_total);

1 0

[commit] r13284 - freeswitch/trunk/src/mod/say/mod_say_ru
by FreeSWITCH SVN 12 May '09

12 May '09

Author: buklov Date: Tue May 12 02:35:51 2009 New Revision: 13284 Log: small fix Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.h Modified: freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.h ============================================================================== --- freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.h (original) +++ freeswitch/trunk/src/mod/say/mod_say_ru/mod_say_ru.h Tue May 12 02:35:51 2009 @@ -152,8 +152,9 @@ //порядковый //мужской +//родительный #define m_14 {\ - {"h-0x","h-1x","h-2x","h-3x","h-4x","h-4x","h-","x"},\ + {"h-0x","h-1x","h-2x","h-3x","h-4x","h-5x","h-","x"},\ {"","","","h-thousandx","h-2xx","h-thousandx","h-3xx","h-thousandx","h-4xx","h-thousandx","h-5xx","h-thousandx","h-","xx"},\ {"","","","h-millionx","h-2xx","h-millionx","h-3xx","h-millionx","h-4xx","h-millionx","h-5xx","h-millionx","h-","xx"},\ 0,\

1 0

[commit] r13283 - freeswitch/trunk/src/mod/applications/mod_voicemail
by FreeSWITCH SVN 12 May '09

12 May '09

Author: mrene Date: Mon May 11 23:58:32 2009 New Revision: 13283 Log: mod_voicemail: rework vm_boxcount api and add an optional profile parameter 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 Mon May 11 23:58:32 2009 @@ -3210,43 +3210,62 @@ } -#define BOXCOUNT_SYNTAX "<user>@<domain>[|[new|saved|new-urgent|saved-urgent|all]]" +#define BOXCOUNT_SYNTAX "[profile/]<user>@<domain>[|[new|saved|new-urgent|saved-urgent|all]]" SWITCH_STANDARD_API(boxcount_api_function) { char *dup; - char *how = "new"; + const char *how = "new"; int total_new_messages = 0; int total_saved_messages = 0; int total_new_urgent_messages = 0; int total_saved_urgent_messages = 0; + vm_profile_t *profile; + char *id, *domain, *p, *profilename = NULL; + + if (switch_strlen_zero(cmd)) { + stream->write_function(stream, "%d", 0); + return SWITCH_STATUS_SUCCESS; + } - if (cmd) { - switch_hash_index_t *hi; - void *val; - vm_profile_t *profile; - char *id, *domain, *p; - - dup = strdup(cmd); - id = dup; + id = dup = strdup(cmd); + + if ((p = strchr(dup, '/'))) { + *p++ = '\0'; + id = p; + profilename = dup; + } + + if (!strncasecmp(id, "sip:", 4)) { + id += 4; + } - if (!strncasecmp(cmd, "sip:", 4)) { - id += 4; - } + if (switch_strlen_zero(id)) { + stream->write_function(stream, "%d", 0); + goto done; + } - if (!id) { - stream->write_function(stream, "%d", 0); - free(dup); - return SWITCH_STATUS_SUCCESS; + if ((domain = strchr(id, '@'))) { + *domain++ = '\0'; + if ((p = strchr(domain, '|'))) { + *p++ = '\0'; + how = p; } - if ((domain = strchr(id, '@'))) { - *domain++ = '\0'; - if ((p = strchr(domain, '|'))) { - *p++ = '\0'; - how = p; + if (!switch_strlen_zero(profilename)) { + if ((profile = get_profile(profilename))) { + message_count(profile, id, domain, "inbox", &total_new_messages, &total_saved_messages, + &total_new_urgent_messages, &total_saved_urgent_messages); + switch_thread_rwlock_unlock(profile->rwlock); + } else { + stream->write_function(stream, "-ERR No such profile\n"); + goto done; } + } else { + /* Kept for backwards-compatibility */ + switch_hash_index_t *hi; switch_mutex_lock(globals.mutex); for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + void *val; switch_hash_this(hi, NULL, NULL, &val); profile = (vm_profile_t *) val; total_new_messages = total_saved_messages = 0; @@ -3255,8 +3274,6 @@ } switch_mutex_unlock(globals.mutex); } - - switch_safe_free(dup); } if (!strcasecmp(how, "saved")) { @@ -3271,6 +3288,8 @@ stream->write_function(stream, "%d", total_new_messages); } +done: + switch_safe_free(dup); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r13282 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 12 May '09

12 May '09

Author: mrene Date: Mon May 11 22:42:11 2009 New Revision: 13282 Log: doh Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon May 11 22:42:11 2009 @@ -2168,7 +2168,7 @@ stop_node_thread(); } - while (hi = switch_hash_first(NULL, globals.fifo_hash)) { + while ((hi = switch_hash_first(NULL, globals.fifo_hash))) { int x = 0; switch_hash_this(hi, NULL, NULL, &val); node = (fifo_node_t *) val;

1 0

[commit] r13281 - freeswitch/trunk/src/mod/applications/mod_fifo
by FreeSWITCH SVN 12 May '09

12 May '09

Author: mrene Date: Mon May 11 22:31:40 2009 New Revision: 13281 Log: s/for/while Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c (original) +++ freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Mon May 11 22:31:40 2009 @@ -2168,7 +2168,7 @@ stop_node_thread(); } - for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_first(NULL, globals.fifo_hash)) { + while (hi = switch_hash_first(NULL, globals.fifo_hash)) { int x = 0; switch_hash_this(hi, NULL, NULL, &val); node = (fifo_node_t *) val;

1 0