March 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r7952 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 24 Mar '08

24 Mar '08

Author: anthm Date: Mon Mar 24 13:09:29 2008 New Revision: 7952 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: up 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 Mar 24 13:09:29 2008 @@ -337,7 +337,10 @@ int custom_pop = 0; int pop_array[MAX_PRI] = { 0 }; char *pop_list[MAX_PRI] = { 0 }; - + const char *fifo_consumer_wrapup_sound = NULL; + const char *fifo_consumer_wrapup_key = NULL; + char buf[5] = ""; + if (argc > 3) { announce = argv[3]; } @@ -508,6 +511,28 @@ if (nowait) { done = 1; } + + fifo_consumer_wrapup_sound = switch_channel_get_variable(channel, "fifo_consumer_wrapup_sound"); + fifo_consumer_wrapup_key = switch_channel_get_variable(channel, "fifo_consumer_wrapup_key"); + memset(buf, 0, sizeof(buf)); + + if (!switch_strlen_zero(fifo_consumer_wrapup_sound)) { + args.buf = buf; + args.buflen = sizeof(buf); + + memset(&args, 0, sizeof(args)); + switch_ivr_play_file(session, NULL, fifo_consumer_wrapup_sound, &args); + } + + if (!switch_strlen_zero(fifo_consumer_wrapup_key) && strcmp(buf, fifo_consumer_wrapup_key)) { + for(;;) { + char terminator = 0; + switch_ivr_collect_digits_count(session, buf, sizeof(buf)-1, 1, fifo_consumer_wrapup_key, &terminator, 0, 0, 0); + if (terminator == *fifo_consumer_wrapup_key) { + break; + } + } + } } switch_safe_free(uuid);

1 0

[commit] r7951 - freeswitch/trunk/src/mod/applications/mod_fifo
by Freeswitch SVN 24 Mar '08

24 Mar '08

Author: mikej Date: Mon Mar 24 12:22:33 2008 New Revision: 7951 Modified: freeswitch/trunk/src/mod/applications/mod_fifo/mod_fifo.c Log: popamatic nullage 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 Mar 24 12:22:33 2008 @@ -388,6 +388,8 @@ while(switch_channel_ready(channel)) { int x = 0 ; + pop = NULL; + if (moh) { args.read_frame_callback = read_frame_callback; args.user_data = node; @@ -423,6 +425,7 @@ } uuid = (char *) pop; + pop = NULL; if ((other_session = switch_core_session_locate(uuid))) { switch_channel_t *other_channel = switch_core_session_get_channel(other_session);

1 0

[commit] r7950 - freeswitch/trunk/src
by Freeswitch SVN 23 Mar '08

23 Mar '08

Author: mikej Date: Sat Mar 22 20:22:18 2008 New Revision: 7950 Modified: freeswitch/trunk/src/switch_time.c Log: deal with linux platforms that have clock_gettime but don't define CLOCK_MONOTONIC. (FSCORE-111) Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Sat Mar 22 20:22:18 2008 @@ -95,7 +95,7 @@ return now; } -#if defined(HAVE_CLOCK_GETTIME) +#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) static int MONO = 1; #else static int MONO = 0; @@ -105,7 +105,7 @@ { switch_time_t now; -#if defined(HAVE_CLOCK_GETTIME) +#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) if (MONO) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); @@ -114,7 +114,7 @@ #endif now = switch_time_now(); -#if defined(HAVE_CLOCK_GETTIME) +#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_MONOTONIC) } #endif

1 0

[commit] r7949 - freeswitch/trunk/src
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: anthm Date: Thu Mar 20 15:29:18 2008 New Revision: 7949 Modified: freeswitch/trunk/src/switch_time.c Log: update Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Thu Mar 20 15:29:18 2008 @@ -295,7 +295,8 @@ uint32_t current_ms = 0; uint32_t x, tick = 0; switch_time_t ts = 0, last = 0; - + int fwd_errs = 0, rev_errs = 0; + switch_time_sync(); memset(&globals, 0, sizeof(globals)); @@ -324,6 +325,7 @@ ts = 0; last = 0; + fwd_errs = rev_errs = 0; while (globals.RUNNING == 1) { runtime.reference += STEP_MIC; @@ -335,20 +337,33 @@ current_ms = 0; tick = 0; runtime.initiated += diff; + rev_errs++; + } else { + rev_errs = 0; } switch_yield(STEP_MIC); last = ts; - } + } + if (ts > (runtime.reference + too_late)) { switch_time_t diff = ts - runtime.reference - STEP_MIC; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Forward Clock Skew Detected!\n"); + fwd_errs++; runtime.reference = switch_time_now(); current_ms = 0; tick = 0; runtime.initiated += diff; + } else { + fwd_errs = 0; } + if (fwd_errs > 9 || rev_errs > 9) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Auto Re-Syncing clock.\n"); + switch_time_sync(); + fwd_errs = rev_errs = 0; + } + runtime.timestamp = ts; current_ms += STEP_MS; tick += STEP_MS;

1 0

[commit] r7948 - freeswitch/trunk/scripts/contrib/intralanman/perl
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: intralanman Date: Thu Mar 20 10:43:44 2008 New Revision: 7948 Modified: freeswitch/trunk/scripts/contrib/intralanman/perl/fspb Log: someone changed the realm on me Modified: freeswitch/trunk/scripts/contrib/intralanman/perl/fspb ============================================================================== --- freeswitch/trunk/scripts/contrib/intralanman/perl/fspb (original) +++ freeswitch/trunk/scripts/contrib/intralanman/perl/fspb Thu Mar 20 10:43:44 2008 @@ -24,18 +24,22 @@ 'H=s', #highlighting to use 'r=s', #how long to keep the paste [dmf] 'l', #use long name user@host - 'h' # help, shows usage() + 'h', # help, shows usage() + 'd' #debug ); # Options Stuff Getopt::Long::config("noignorecase", "bundling"); GetOptions(\%options, @getopt_args); usage() if $options{h}; +$debug = 1 if $options{d}; my $nick = length($options{n}) > 0 ? $options{n} : $login; $nick = $options{l} ? $nick . "_AT_" . $host : $nick; my $highlighting = length($options{H}) > 0 ? $options{H} : 'text'; my $keep = length($options{r}) > 0 ? $options{r} : 'd'; -#print "Nick is $nick\nhighlighting is $highlighting\nKeep for $keep\n"; +if($debug) { + print "Nick is $nick\nhighlighting is $highlighting\nKeep for $keep\n"; +} #exit; @@ -43,9 +47,11 @@ $text .= $line; } push @{ $ua->requests_redirectable }, 'POST'; +# this should be smart enough to get the realm on its own.... +# maybe in a future version, i'll add that $ua ->credentials( 'pastebin.freeswitch.org:80', - 'pastebin/freeswitch', + 'the login and password is pastebin/freeswitch', 'pastebin' => 'freeswitch' ); my $response = $ua -> post($url, @@ -59,10 +65,11 @@ } ); -#print $response -> content; -#print "---- Dumper Start ----\n"; -#print Dumper $response; -#print "---- Dumper Stop ----\n"; -#print Dumper \@{$ua}; +if($debug) { + print $response -> content; + print "---- Dumper Start ----\n"; + print Dumper $response; + print "---- Dumper Stop ----\n"; +} print "Your Post can be seen at: " . $response->{_previous}->{_headers}->{location} . "\n";

1 0

[commit] r7947 - freeswitch/trunk/build
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: brian Date: Thu Mar 20 09:42:42 2008 New Revision: 7947 Modified: freeswitch/trunk/build/freeswitch.init.redhat Log: tweak, Thanks you Andrew Modified: freeswitch/trunk/build/freeswitch.init.redhat ============================================================================== --- freeswitch/trunk/build/freeswitch.init.redhat (original) +++ freeswitch/trunk/build/freeswitch.init.redhat Thu Mar 20 09:42:42 2008 @@ -94,7 +94,7 @@ [ -f $PID_FILE ] && restart || : ;; *) - echo "Usage: $PROG_NAME {start|stop|status|reload|restart" + echo "Usage: $PROG_NAME {start|stop|status|reload|restart}" exit 1 ;; esac

1 0

[commit] r7944 - freeswitch/trunk/src/mod/applications/mod_enum
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: mikej Date: Wed Mar 19 23:36:30 2008 New Revision: 7944 Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Log: return mistakenly removed code. Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Wed Mar 19 23:36:30 2008 @@ -285,6 +285,7 @@ char *service = NULL; char *regex = NULL; char *replace = NULL; + char *ptr; int argc = 0; char *argv[4] = { 0 }; int n; @@ -333,6 +334,12 @@ goto xperr; } + for (ptr = replace; ptr && *ptr; ptr++) { + if (*ptr == '\\') { + *ptr = '$'; + } + } + if (flags && service && regex && replace) { switch_regex_t *re = NULL; int proceed = 0, ovector[30];

1 0

[commit] r7943 - freeswitch/trunk/src
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: mikej Date: Wed Mar 19 22:05:34 2008 New Revision: 7943 Modified: freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_core_memory.c freeswitch/trunk/src/switch_time.c Log: fix shutdown race destroying memory pools. Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Mar 19 22:05:34 2008 @@ -1049,6 +1049,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "End existing sessions\n"); switch_core_session_hupall(SWITCH_CAUSE_SYSTEM_SHUTDOWN); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Clean up modules.\n"); + switch_core_memory_stop(); switch_loadable_module_shutdown(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Closing Event Engine.\n"); @@ -1061,7 +1062,6 @@ switch_rtp_shutdown(); switch_xml_destroy(); - switch_core_memory_stop(); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Finalizing Shutdown.\n"); switch_log_shutdown(); Modified: freeswitch/trunk/src/switch_core_memory.c ============================================================================== --- freeswitch/trunk/src/switch_core_memory.c (original) +++ freeswitch/trunk/src/switch_core_memory.c Wed Mar 19 22:05:34 2008 @@ -312,16 +312,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_perform_destroy_memory_pool(switch_memory_pool_t **pool, const char *file, const char *func, int line) { - //char tmp[128] = ""; - - switch_assert(pool != NULL); #ifdef DEBUG_ALLOC2 switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "Free Pool\n"); #endif - if (switch_queue_push(memory_manager.pool_queue, *pool) != SWITCH_STATUS_SUCCESS) { + if ((memory_manager.pool_thread_running != 1) || (switch_queue_push(memory_manager.pool_queue, *pool) != SWITCH_STATUS_SUCCESS)) { apr_pool_destroy(*pool); } *pool = NULL; Modified: freeswitch/trunk/src/switch_time.c ============================================================================== --- freeswitch/trunk/src/switch_time.c (original) +++ freeswitch/trunk/src/switch_time.c Wed Mar 19 22:05:34 2008 @@ -421,7 +421,6 @@ switch_yield(10000); } } - switch_core_destroy_memory_pool(&module_pool); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r7942 - in freeswitch/trunk/src/mod: applications/mod_fsv languages/mod_spidermonkey_curl
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: mikej Date: Wed Mar 19 20:47:30 2008 New Revision: 7942 Modified: freeswitch/trunk/src/mod/applications/mod_fsv/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey_curl/ (props changed) Log: svn:ignore

1 0

[commit] r7941 - freeswitch/trunk/conf
by Freeswitch SVN 20 Mar '08

20 Mar '08

Author: brian Date: Wed Mar 19 20:44:35 2008 New Revision: 7941 Modified: freeswitch/trunk/conf/vars.xml Log: tweak this Modified: freeswitch/trunk/conf/vars.xml ============================================================================== --- freeswitch/trunk/conf/vars.xml (original) +++ freeswitch/trunk/conf/vars.xml Wed Mar 19 20:44:35 2008 @@ -55,7 +55,7 @@ H264 - H.264 Video --> - <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM,H263"/> + <X-PRE-PROCESS cmd="set" data="global_codec_prefs=G722,PCMU,PCMA,GSM"/> <X-PRE-PROCESS cmd="set" data="outbound_codec_prefs=PCMU,PCMA,GSM"/> <X-PRE-PROCESS cmd="set" data="xmpp_client_profile=xmppc"/> <X-PRE-PROCESS cmd="set" data="xmpp_server_profile=xmpps"/>

1 0