- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r3479 - freeswitch/branches/igorneves/scripts/socket
by Freeswitch SVN 29 Nov '06

29 Nov '06

Author: igorneves Date: Tue Nov 28 19:19:43 2006 New Revision: 3479 Added: freeswitch/branches/igorneves/scripts/socket/fsconsole.pl Log: now you can do exit or quit and its matched by regexp so you can put spaces or something and now the title window have the hostname machine where you are running fsconsole.pl Added: freeswitch/branches/igorneves/scripts/socket/fsconsole.pl ============================================================================== --- (empty file) +++ freeswitch/branches/igorneves/scripts/socket/fsconsole.pl Tue Nov 28 19:19:43 2006 @@ -0,0 +1,369 @@ +#!/usr/bin/perl +use strict; +use warnings; + +sub POE::Kernel::ASSERT_DEFAULT () { 1 }; +sub Term::Visual::DEBUG () { 1 } +sub Term::Visual::DEBUG_FILE () { 'test.log' } +use IO::Socket; +use POE qw/Filter::FSSocket Component::Client::TCP/; +use Data::Dumper; +use Term::Visual; +use Sys::Hostname; + +local *D; +if (Term::Visual::DEBUG) { + *D = *Term::Visual::ERRS; +} + +#local *ERROR = *STDERR; + + +$SIG{__DIE__} = sub { + if (Term::Visual::DEBUG) { + print Term::Visual::ERRS "Died: @_\n"; + } +}; + +############################################################################### +## BEGIN Globals ############################################################## +############################################################################### +our $server_address = "127.0.0.1"; +our $server_port = "8021"; +our $server_secret = "ClueCon"; + +#this is where you can customize the color scheme +our %Pallet = ( + 'warn_bullet' => 'bold yellow', + 'err_bullet' => 'bold red', + 'out_bullet' => 'bold green', + 'access' => 'bright red on blue', + 'current' => 'bright yellow on blue', +); + +our $terminal; +my %sockets; +my %windows; +my %unread_count; +my %commands = ( + 'window' => 1, + 'w' => 1, + 'win' => 1, +); +############################################################################### +## END Globals ############################################################## +############################################################################### + +#setup our session +POE::Session->create( + 'inline_states' => { + '_start' => \&handle_start, #session start + '_stop' => \&handle_stop, #session stop + 'curses_input' => \&handle_curses_input, #input from the keyboard + 'update_time' => \&handle_update_time, #update the status line clock + 'quit' => \&handle_quit, #handler to do any cleanup + 'server_input' => \&handle_server_input, + '_default' => \&handle_default, + }, + 'heap' => { + 'terminal' => undef, + 'freeswitch' => undef, + }, +); + +#start the kernel a chugging along +$poe_kernel->run; + +############################################################################### +## BEGIN Handlers ############################################################# +############################################################################### +#handles any startup functions for our session +sub handle_default { +} + +sub handle_start { + my ($kernel, $session, $heap) = @_[KERNEL, SESSION, HEAP]; + + #setup our terminal + $heap->{'terminal'} = Term::Visual->new( + 'Alias' => 'terminal', #poe alias for this + 'History_Size' => 300, #number of things to keep in history + 'Common_Input' => 1, #all windows share input and history + 'Tab_Complete' => \&tab_complete, + ); + + $terminal = $heap->{'terminal'}; + + #setup the color palette + $terminal->set_palette(%Pallet); + + #create a base window + my $window_id = $terminal->create_window( + 'Window_Name' => 'console', + 'Buffer_Size' => 3000, + 'Title' => 'FreeSWITCH Console @ '.hostname, + 'Status' => { + '0' => { + 'format' => '%s', + 'fields' => ['time'], + }, + '1' => { + 'format' => '%s', + 'fields' => ['window_status'], + }, + }, + ); + + $windows{'console'} = $window_id; + + $window_id = $terminal->create_window( + 'Window_Name' => 'log', + 'Buffer_Size' => 3000, + 'Title' => 'FreeSWITCH Logs', + 'Status' => { + '0' => { + 'format' => '%s', + 'fields' => ['time'], + }, + '1' => { + 'format' => '%s', + 'fields' => ['window_status'], + }, + }, + ); + + $windows{'log'} = $window_id; + + $window_id = $terminal->create_window( + 'Window_Name' => 'event', + 'Buffer_Size' => 3000, + 'Title' => 'FreeSWITCH Event', + 'Status' => { + '0' => { + 'format' => '%s', + 'fields' => ['time'], + }, + '1' => { + 'format' => '%s', + 'fields' => ['window_status'], + }, + }, + ); + + $windows{'event'} = $window_id; + + #tell the terminal what to call when there is input from the keyboard + $kernel->post('terminal' => 'send_me_input' => 'curses_input'); + + $terminal->change_window(0); + $kernel->delay_set('update_time' => 1); + $terminal->set_status_field(0, 'time' => scalar(localtime)); + new_message('destination_window' => 0, 'message' => " +Welcome to the FreeSWITCH POE Curses Console! + The console is split into three windows: + - 'console' for api response messages + - 'log' for freeswitch log output (simply send the log level you want + to start seeing events eg: 'log all') + - 'event' for freeswitch event output (must subscribe in plain format + eg: 'event plain all') + +To switch between windows type 'w <windowname' so 'w log' for example. + +Coming soon: + - Tab completion + - command history + - window status in the bar (messages added since last view, etc...) + +Send any bug reports or comments to jackhammer\(a)gmail.com + +Thanks, +Paul\n"); + + $terminal->set_status_field($terminal->current_window, 'window_status' => format_window_status()); + + #connect to freeswitch + $heap->{'freeswitch'} = POE::Component::Client::TCP->new( + 'RemoteAddress' => $server_address, + 'RemotePort' => $server_port, + 'ServerInput' => \&handle_server_input, + 'Connected' => \&handle_fs_connected, + 'ServerError' => \&handle_server_error, + 'Disconnected' => \&handle_server_disconnect, + 'Domain' => AF_INET, + 'Filter' => POE::Filter::FSSocket->new(), + ); + +} + +#called when users enter commands in a window +sub handle_curses_input { + my ($kernel, $heap, $input, $context) = @_[KERNEL, HEAP, ARG0, ARG1]; + + #get the id of the window that is responsible for the input + my $window = $heap->{'terminal'}->current_window; + + open(ERROR, ">>error.log"); + + if($input =~ /^\s*(exit)|(quit)\s*$/) { + $kernel->yield('quit'); + } elsif ($input =~ /^w\ (.*)$/) { + #get the id of the requested window + eval { + my $window_id = $windows{$1}; + + #see if it's real + if(defined($window_id)) { + $unread_count{$window_id} = 0; + $terminal->change_window($window_id); + $terminal->set_status_field($window_id, 'window_status' => &format_window_status()); + } + }; + if($@) { + print ERROR "put error: $@\n"; + } + } else { + #see if we got connected at some point + if(defined($sockets{'localhost'})) { + my $cmd; + if ($input =~ /^log|^event/) { + $cmd = $input; + } else { + $cmd = "api $input"; + } + #send the command + $sockets{'localhost'}->put($cmd); + } + } +} + +sub handle_fs_connected { + my ($kernel, $heap) = @_[KERNEL, HEAP]; + + eval { + $sockets{'localhost'} = $heap->{'server'}; + } +} + +#this is responsible for doing any cleanup and returning the terminal to the previous +#state before we mucked with it +sub handle_quit { + my ($kernel, $heap) = @_[KERNEL, HEAP]; + + #tell curses to clean up it's crap + $kernel->post('terminal' => 'shutdown'); + + #there is probably a more elegant way, but this works for now + exit; +} + +#data from freeswitch +sub handle_server_input { + my ($kernel,$heap,$input) = @_[KERNEL,HEAP,ARG0]; + + eval { + #terminal HATES null + if(defined($input->{'__DATA__'})) { + $input->{'__DATA__'} =~ s/[\x00]//g; + } + + #handle the login + if($input->{'Content-Type'} eq "auth/request") { + $heap->{'server'}->put("auth $server_secret"); + } elsif ($input->{'Content-Type'} eq "api/response") { + new_message('destination_window' => 0, 'message' => 'API Response: '); + new_message('destination_window' => 0, 'message' => $input->{'__DATA__'}); + } elsif ($input->{'Content-Type'} eq "log/data") { + new_message('destination_window' => 1, 'message' => $input->{'__DATA__'}); + } elsif ($input->{'Content-Type'} eq "text/event-plain") { + new_message('destination_window' => 2, 'message' => Dumper $input); + } elsif ($input->{'Content-Type'} eq "command/reply") { + new_message('destination_window' => 0, 'message' => 'Command Response: ' . $input->{'Reply-Text'}); + } + }; + + if($@) { + open(ERROR, ">>error.log"); + print ERROR "died: $@\n"; + print ERROR Dumper $heap; + close(ERROR); + } +} + +sub handle_server_error { +} + +sub handle_server_disconnect { +} + +sub tab_complete { + my $left = shift; + + my @return; + + if(defined($commands{$left})) { + return [$left . " "]; + #} elsif () { + } + +} + +sub handle_update_time { + my ($kernel, $heap) = @_[KERNEL, HEAP]; + $terminal->set_status_field($terminal->current_window, 'time' => scalar(localtime)); + $kernel->delay_set('update_time' => 1); +} +############################################################################### +## END Handlers ############################################################# +############################################################################### + +sub new_message { + my %args = @_; + + my $message = $args{'message'}; + my $destination_window = $args{'destination_window'}; + + my $status_field; + + #see if we are on the window being updated + if($terminal->current_window != $destination_window) { + #increment the unread count for the window + #FIXME, should we count messages or lines? + $unread_count{$destination_window}++; + + + #update the status bar + eval { + $terminal->set_status_field($terminal->current_window, 'window_status' => &format_window_status()); + }; + + if($@) { + print $@; + } + } + + + #deliver the message + $terminal->print($destination_window, $message); +} + +sub format_window_status { + my $status_field; + + #put all the windows in the bar with their current unread count + foreach my $window (sort {$windows{$a} <=> $windows{$b}} keys %windows) { + #see if we are printing the current window + if($terminal->current_window == $windows{$window}) { + $status_field .= "[\0(current)$window\0(st_frames)"; + } else { + $status_field .= "[$window"; + } + + if($unread_count{$windows{$window}}) { + $status_field .= " (" . $unread_count{$windows{$window}} . ")"; + } + + $status_field .= "] "; + } + + return $status_field; +}

1 0

[commit] r3478 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: anthm Date: Tue Nov 28 17:37:53 2006 New Revision: 3478 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: update Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Nov 28 17:37:53 2006 @@ -858,7 +858,7 @@ } if (argc > 3) { - JS_ValueToInt32(cx, argv[4], &limit); + JS_ValueToInt32(cx, argv[3], &limit); } }

1 0

[commit] r3477 - freeswitch/trunk
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: ptinsley Date: Tue Nov 28 17:13:45 2006 New Revision: 3477 Modified: freeswitch/trunk/INSTALL Log: Add a notice to try and deal with a common build problem. Modified: freeswitch/trunk/INSTALL ============================================================================== --- freeswitch/trunk/INSTALL (original) +++ freeswitch/trunk/INSTALL Tue Nov 28 17:13:45 2006 @@ -1,3 +1,9 @@ +**************************************** NOTICE ******************************* +You MUST own the destination path of /usr/local/freeswitch for the project to +build properly! The alternative is to pick a different prefix with ./configure +--prefix=/my/special/place . +******************************************************************************* + UNIX: You will need 'wget' installed in your path so the build system can download the dependancies.

1 0

[commit] r3476 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: anthm Date: Tue Nov 28 16:59:27 2006 New Revision: 3476 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: doh Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Nov 28 16:59:27 2006 @@ -824,7 +824,6 @@ struct js_session *jss = JS_GetPrivate(cx, obj); switch_channel_t *channel; char *file_name = NULL; - char *input_callback = NULL; void *bp = NULL; int len = 0; switch_input_callback_function_t dtmf_func = NULL; @@ -845,7 +844,6 @@ if (argc > 1) { if ((function = JS_ValueToFunction(cx, argv[1]))) { memset(&cb_state, 0, sizeof(cb_state)); - switch_copy_string(cb_state.code_buffer, input_callback, sizeof(cb_state.code_buffer)); cb_state.session_state = jss; cb_state.function = function; cb_state.cx = cx;

1 0

[commit] r3475 - in freeswitch/trunk/src: . include mod/applications/mod_playback mod/languages/mod_perl mod/languages/mod_php mod/languages/mod_python mod/languages/mod_ruby mod/languages/mod_spidermonkey
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: anthm Date: Tue Nov 28 16:46:29 2006 New Revision: 3475 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c freeswitch/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig_wrap.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/switch_ivr.c freeswitch/trunk/src/switch_swig.c Log: add timelimit to record Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Tue Nov 28 16:46:29 2006 @@ -200,15 +200,17 @@ \param dtmf_callback code to execute if any dtmf is dialed during the recording \param buf an object to maintain across calls \param buflen the size of buf + \param limit max limit to record for (0 for infinite) \return SWITCH_STATUS_SUCCESS if all is well \note passing a NULL dtmf_callback nad a not NULL buf indicates to copy any dtmf to buf and stop recording. */ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *session, - switch_file_handle_t *fh, - char *file, - switch_input_callback_function_t dtmf_callback, - void *buf, - uint32_t buflen); + switch_file_handle_t *fh, + char *file, + switch_input_callback_function_t dtmf_callback, + void *buf, + uint32_t buflen, + uint32_t limit); /*! \brief Function to evaluate an expression against a string Modified: freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c (original) +++ freeswitch/trunk/src/mod/applications/mod_playback/mod_playback.c Tue Nov 28 16:46:29 2006 @@ -132,10 +132,20 @@ { switch_channel_t *channel; switch_status_t status; + uint32_t limit = 0; + char *path; + char *p; + channel = switch_core_session_get_channel(session); assert(channel != NULL); - status = switch_ivr_record_file(session, NULL, data, on_dtmf, NULL, 0); + path = switch_core_session_strdup(session, data); + if ((p = strchr(path, '+'))) { + *p++ = '\0'; + limit = atoi(p); + } + + status = switch_ivr_record_file(session, NULL, path, on_dtmf, NULL, 0, limit); if (!switch_channel_ready(channel) || (status != SWITCH_STATUS_SUCCESS && !SWITCH_STATUS_IS_BREAK(status))) { switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); Modified: freeswitch/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/switch_swig_wrap.c Tue Nov 28 16:46:29 2006 @@ -43,7 +43,6 @@ ************************************************************************/ #include <string.h> -#include <switch.h> #if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__) # if defined(_MSC_VER) || defined(__GNUC__) @@ -808,7 +807,7 @@ extern void fs_channel_get_variable(switch_core_session_t *,char *); extern void fs_channel_set_state(switch_core_session_t *,char *); extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int); -extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int); +extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int,unsigned int); extern int fs_switch_ivr_sleep(switch_core_session_t *,uint32_t); extern int fs_ivr_play_file2(switch_core_session_t *,char *); extern int fs_switch_ivr_collect_digits_callback(switch_core_session_t *,switch_input_callback_function_t,void *,unsigned int,unsigned int); @@ -1263,12 +1262,13 @@ switch_input_callback_function_t arg4 ; void *arg5 = (void *) 0 ; unsigned int arg6 ; + unsigned int arg7 ; int result; int argvi = 0; dXSARGS; - if ((items < 6) || (items > 6)) { - SWIG_croak("Usage: fs_switch_ivr_record_file(session,fh,file,dtmf_callback,buf,buflen);"); + if ((items < 7) || (items > 7)) { + SWIG_croak("Usage: fs_switch_ivr_record_file(session,fh,file,dtmf_callback,buf,buflen,limit);"); } { if (SWIG_ConvertPtr(ST(0), (void **) &arg1, SWIGTYPE_p_switch_core_session_t,0) < 0) { @@ -1295,7 +1295,8 @@ } } arg6 = (unsigned int) SvUV(ST(5)); - result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6); + arg7 = (unsigned int) SvUV(ST(6)); + result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6,arg7); ST(argvi) = sv_newmortal(); sv_setiv(ST(argvi++), (IV) result); Modified: freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h (original) +++ freeswitch/trunk/src/mod/languages/mod_php/php_freeswitch.h Tue Nov 28 16:46:29 2006 @@ -93,14 +93,3 @@ #endif #endif /* PHP_FREESWITCH_H */ - -/* For Emacs: - * Local Variables: - * mode:c - * indent-tabs-mode:nil - * tab-width:4 - * c-basic-offset:4 - * End: - * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4 expandtab: - */ Modified: freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c (original) +++ freeswitch/trunk/src/mod/languages/mod_php/switch_swig_wrap.c Tue Nov 28 16:46:29 2006 @@ -577,7 +577,7 @@ extern void fs_channel_get_variable(switch_core_session_t *,char *); extern void fs_channel_set_state(switch_core_session_t *,char *); extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int); -extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int); +extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int,unsigned int); extern int fs_switch_ivr_sleep(switch_core_session_t *,uint32_t); extern int fs_ivr_play_file2(switch_core_session_t *,char *); extern int fs_switch_ivr_collect_digits_callback(switch_core_session_t *,switch_input_callback_function_t,void *,unsigned int,unsigned int); @@ -1143,15 +1143,16 @@ switch_input_callback_function_t arg4 ; void *arg5 = (void *) 0 ; unsigned int arg6 ; + unsigned int arg7 ; int result; - zval **args[7]; + zval **args[8]; int argbase=0 ; if (this_ptr && this_ptr->type==IS_OBJECT) { /* fake this_ptr as first arg (till we can work out how to do it better */ argbase++; } - if(((ZEND_NUM_ARGS() + argbase )!= 6) || (zend_get_parameters_array_ex(6-argbase, args)!= SUCCESS)) { + if(((ZEND_NUM_ARGS() + argbase )!= 7) || (zend_get_parameters_array_ex(7-argbase, args)!= SUCCESS)) { WRONG_PARAM_COUNT; } @@ -1187,7 +1188,11 @@ convert_to_long_ex(args[5-argbase]); arg6 = (unsigned int) Z_LVAL_PP(args[5-argbase]); - result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6); + + convert_to_long_ex(args[6-argbase]); + arg7 = (unsigned int) Z_LVAL_PP(args[6-argbase]); + + result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6,arg7); ZVAL_LONG(return_value,result); Modified: freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c (original) +++ freeswitch/trunk/src/mod/languages/mod_python/switch_swig_wrap.c Tue Nov 28 16:46:29 2006 @@ -716,7 +716,7 @@ extern void fs_channel_get_variable(switch_core_session_t *,char *); extern void fs_channel_set_state(switch_core_session_t *,char *); extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int); -extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int); +extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int,unsigned int); extern int fs_switch_ivr_sleep(switch_core_session_t *,uint32_t); extern int fs_ivr_play_file2(switch_core_session_t *,char *); extern int fs_switch_ivr_collect_digits_callback(switch_core_session_t *,switch_input_callback_function_t,void *,unsigned int,unsigned int); @@ -1000,6 +1000,7 @@ switch_input_callback_function_t arg4 ; void *arg5 = (void *) 0 ; unsigned int arg6 ; + unsigned int arg7 ; int result; switch_input_callback_function_t *argp4 ; PyObject * obj0 = 0 ; @@ -1007,8 +1008,9 @@ PyObject * obj3 = 0 ; PyObject * obj4 = 0 ; PyObject * obj5 = 0 ; + PyObject * obj6 = 0 ; - if(!PyArg_ParseTuple(args,(char *)"OOsOOO:fs_switch_ivr_record_file",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5)) goto fail; + if(!PyArg_ParseTuple(args,(char *)"OOsOOOO:fs_switch_ivr_record_file",&obj0,&obj1,&arg3,&obj3,&obj4,&obj5,&obj6)) goto fail; if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_switch_core_session_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_switch_file_handle_t,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; if ((SWIG_ConvertPtr(obj3,(void **) &argp4, SWIGTYPE_p_switch_input_callback_function_t,SWIG_POINTER_EXCEPTION) == -1)) SWIG_fail; @@ -1016,7 +1018,9 @@ if ((SWIG_ConvertPtr(obj4,(void **) &arg5, 0, SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail; arg6 = (unsigned int) PyInt_AsLong(obj5); if (PyErr_Occurred()) SWIG_fail; - result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6); + arg7 = (unsigned int) PyInt_AsLong(obj6); + if (PyErr_Occurred()) SWIG_fail; + result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6,arg7); resultobj = PyInt_FromLong((long)result); return resultobj; Modified: freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig_wrap.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig_wrap.c (original) +++ freeswitch/trunk/src/mod/languages/mod_ruby/switch_swig_wrap.c Tue Nov 28 16:46:29 2006 @@ -628,7 +628,7 @@ extern void fs_channel_get_variable(switch_core_session_t *,char *); extern void fs_channel_set_state(switch_core_session_t *,char *); extern int fs_ivr_play_file(switch_core_session_t *,char *,char *,switch_input_callback_function_t,void *,unsigned int); -extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int); +extern int fs_switch_ivr_record_file(switch_core_session_t *,switch_file_handle_t *,char *,switch_input_callback_function_t,void *,unsigned int,unsigned int); extern int fs_switch_ivr_sleep(switch_core_session_t *,uint32_t); extern int fs_ivr_play_file2(switch_core_session_t *,char *); extern int fs_switch_ivr_collect_digits_callback(switch_core_session_t *,switch_input_callback_function_t,void *,unsigned int,unsigned int); @@ -893,11 +893,12 @@ switch_input_callback_function_t arg4 ; void *arg5 = (void *) 0 ; unsigned int arg6 ; + unsigned int arg7 ; int result; VALUE vresult = Qnil; - if ((argc < 6) || (argc > 6)) - rb_raise(rb_eArgError, "wrong # of arguments(%d for 6)",argc); + if ((argc < 7) || (argc > 7)) + rb_raise(rb_eArgError, "wrong # of arguments(%d for 7)",argc); SWIG_ConvertPtr(argv[0], (void **) &arg1, SWIGTYPE_p_switch_core_session_t, 1); SWIG_ConvertPtr(argv[1], (void **) &arg2, SWIGTYPE_p_switch_file_handle_t, 1); arg3 = StringValuePtr(argv[2]); @@ -908,7 +909,8 @@ } SWIG_ConvertPtr(argv[4], (void **) &arg5, 0, 1); arg6 = NUM2UINT(argv[5]); - result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6); + arg7 = NUM2UINT(argv[6]); + result = (int)fs_switch_ivr_record_file(arg1,arg2,arg3,arg4,arg5,arg6,arg7); vresult = INT2NUM(result); return vresult; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Nov 28 16:46:29 2006 @@ -831,6 +831,7 @@ struct input_callback_state cb_state = {0}; switch_file_handle_t fh; JSFunction *function; + int32 limit = 0; channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); @@ -857,12 +858,16 @@ bp = &cb_state; len = sizeof(cb_state); } + + if (argc > 3) { + JS_ValueToInt32(cx, argv[4], &limit); + } } memset(&fh, 0, sizeof(fh)); cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); - switch_ivr_record_file(jss->session, &fh, file_name, dtmf_func, bp, len); + switch_ivr_record_file(jss->session, &fh, file_name, dtmf_func, bp, len, limit); *rval = cb_state.ret; return (switch_channel_ready(channel)) ? JS_TRUE : JS_FALSE; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Tue Nov 28 16:46:29 2006 @@ -325,11 +325,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_record_file(switch_core_session_t *session, - switch_file_handle_t *fh, - char *file, - switch_input_callback_function_t input_callback, - void *buf, - uint32_t buflen) + switch_file_handle_t *fh, + char *file, + switch_input_callback_function_t input_callback, + void *buf, + uint32_t buflen, + uint32_t limit) { switch_channel_t *channel; char dtmf[128]; @@ -340,6 +341,7 @@ switch_status_t status = SWITCH_STATUS_SUCCESS; char *p; const char *vval; + time_t start = 0; if (!fh) { fh = &lfh; @@ -422,16 +424,22 @@ return SWITCH_STATUS_GENERR; } + if (limit) { + start = time(NULL); + } while(switch_channel_ready(channel)) { switch_size_t len; switch_event_t *event; - - if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { + if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) { switch_ivr_parse_event(session, event); switch_event_destroy(&event); } + + if (start && (time(NULL) - start) > limit) { + break; + } if (input_callback || buf || buflen) { /* Modified: freeswitch/trunk/src/switch_swig.c ============================================================================== --- freeswitch/trunk/src/switch_swig.c (original) +++ freeswitch/trunk/src/switch_swig.c Tue Nov 28 16:46:29 2006 @@ -88,17 +88,17 @@ void fs_consol_log(char *level_str, char *msg) { - switch_log_level_t level = SWITCH_LOG_DEBUG; - if (level_str) { - level = switch_log_str2level(level_str); + switch_log_level_t level = SWITCH_LOG_DEBUG; + if (level_str) { + level = switch_log_str2level(level_str); } - switch_log_printf(SWITCH_CHANNEL_LOG, level, msg); + switch_log_printf(SWITCH_CHANNEL_LOG, level, msg); } void fs_consol_clean(char *msg) { - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, msg); + switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, msg); } switch_core_session_t *fs_core_session_locate(char *uuid) @@ -154,7 +154,7 @@ /* -IVR Routines! You can do IVR in PHP NOW! + IVR Routines! You can do IVR in PHP NOW! */ int fs_ivr_play_file(switch_core_session_t *session, @@ -174,20 +174,22 @@ } int fs_switch_ivr_record_file(switch_core_session_t *session, - switch_file_handle_t *fh, - char *file, - switch_input_callback_function_t dtmf_callback, - void *buf, - unsigned int buflen) + switch_file_handle_t *fh, + char *file, + switch_input_callback_function_t dtmf_callback, + void *buf, + unsigned int buflen, + unsigned int limit + ) { switch_status_t status; - status = switch_ivr_record_file(session, fh, file, dtmf_callback, buf, buflen); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + status = switch_ivr_record_file(session, fh, file, dtmf_callback, buf, buflen, limit); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } int fs_switch_ivr_sleep(switch_core_session_t *session, - uint32_t ms) + uint32_t ms) { switch_status_t status; status = switch_ivr_sleep(session, ms); @@ -211,98 +213,98 @@ unsigned int buflen, unsigned int timeout) { - switch_status_t status; + switch_status_t status; - status = switch_ivr_collect_digits_callback(session, dtmf_callback, buf, buflen, timeout); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + status = switch_ivr_collect_digits_callback(session, dtmf_callback, buf, buflen, timeout); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } int fs_switch_ivr_collect_digits_count (switch_core_session_t *session, - char *buf, - unsigned int buflen, - unsigned int maxdigits, - const char *terminators, - char *terminator, - unsigned int timeout) + char *buf, + unsigned int buflen, + unsigned int maxdigits, + const char *terminators, + char *terminator, + unsigned int timeout) { - switch_status_t status; + switch_status_t status; - status = switch_ivr_collect_digits_count(session, buf, buflen, maxdigits, terminators, terminator, timeout); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + status = switch_ivr_collect_digits_count(session, buf, buflen, maxdigits, terminators, terminator, timeout); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } /*int fs_switch_ivr_multi_threaded_bridge (switch_core_session_t *session, - switch_core_session_t *peer_session, - switch_input_callback_function_t dtmf_callback, - void *session_data, - void *peer_session_data) -{ - switch_status_t status; + switch_core_session_t *peer_session, + switch_input_callback_function_t dtmf_callback, + void *session_data, + void *peer_session_data) + { + switch_status_t status; - status = switch_ivr_multi_threaded_bridge(session, peer_session, dtmf_callback, session_data, peer_session_data); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; -} + status = switch_ivr_multi_threaded_bridge(session, peer_session, dtmf_callback, session_data, peer_session_data); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + } */ int fs_switch_ivr_originate (switch_core_session_t *session, - switch_core_session_t **bleg, - char * bridgeto, - uint32_t timelimit_sec) - /*const switch_state_handler_table_t *table, - char * cid_name_override, - char * cid_num_override, - switch_caller_profile_t *caller_profile_override) */ + switch_core_session_t **bleg, + char * bridgeto, + uint32_t timelimit_sec) +/*const switch_state_handler_table_t *table, + char * cid_name_override, + char * cid_num_override, + switch_caller_profile_t *caller_profile_override) */ { - switch_channel_t *caller_channel; - switch_core_session_t *peer_session; - unsigned int timelimit = 60; - char *var; - switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; + switch_channel_t *caller_channel; + switch_core_session_t *peer_session; + unsigned int timelimit = 60; + char *var; + switch_call_cause_t cause = SWITCH_CAUSE_NORMAL_CLEARING; - caller_channel = switch_core_session_get_channel(session); - assert(caller_channel != NULL); + caller_channel = switch_core_session_get_channel(session); + assert(caller_channel != NULL); - if ((var = switch_channel_get_variable(caller_channel, "call_timeout"))) { - timelimit = atoi(var); - } + if ((var = switch_channel_get_variable(caller_channel, "call_timeout"))) { + timelimit = atoi(var); + } - if (switch_ivr_originate(session, &peer_session, &cause, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); - switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); - return; - } else { - switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); - } + if (switch_ivr_originate(session, &peer_session, &cause, bridgeto, timelimit, NULL, NULL, NULL, NULL) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n"); + switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL); + return; + } else { + switch_ivr_multi_threaded_bridge(session, peer_session, NULL, NULL, NULL); + } } int fs_switch_ivr_session_transfer(switch_core_session_t *session, - char *extension, - char *dialplan, - char *context) + char *extension, + char *dialplan, + char *context) { - switch_status_t status; + switch_status_t status; - status = switch_ivr_session_transfer(session,extension,dialplan,context); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + status = switch_ivr_session_transfer(session,extension,dialplan,context); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } int fs_switch_ivr_speak_text (switch_core_session_t *session, - char *tts_name, - char *voice_name, - char *timer_name, - uint32_t rate, - switch_input_callback_function_t dtmf_callback, - char *text, - void *buf, - unsigned int buflen) + char *tts_name, + char *voice_name, + char *timer_name, + uint32_t rate, + switch_input_callback_function_t dtmf_callback, + char *text, + void *buf, + unsigned int buflen) { - switch_status_t status; + switch_status_t status; - status = switch_ivr_speak_text(session,tts_name,voice_name,timer_name,rate,dtmf_callback,text,buf,buflen); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + status = switch_ivr_speak_text(session,tts_name,voice_name,timer_name,rate,dtmf_callback,text,buf,buflen); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } @@ -320,10 +322,10 @@ int fs_switch_channel_set_variable(switch_channel_t *channel, char *varname, char *value) { - switch_status_t status; + switch_status_t status; - status = switch_channel_set_variable(channel, varname, value); - return status == SWITCH_STATUS_SUCCESS ? 1 : 0; + status = switch_channel_set_variable(channel, varname, value); + return status == SWITCH_STATUS_SUCCESS ? 1 : 0; } /* For Emacs:

1 0

[commit] r3474 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: anthm Date: Tue Nov 28 15:54:26 2006 New Revision: 3474 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Log: fix a few js issues Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Tue Nov 28 15:54:26 2006 @@ -31,7 +31,7 @@ */ #include "mod_spidermonkey.h" -static const char modname[] = "coreDB"; +static const char modname[] = "CoreDB"; struct db_obj { switch_memory_pool_t *pool;

1 0

[commit] r3473 - freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: anthm Date: Tue Nov 28 15:53:26 2006 New Revision: 3473 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Log: fix a few js issues Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Tue Nov 28 15:53:26 2006 @@ -31,7 +31,7 @@ */ #include "mod_spidermonkey.h" -static const char modname[] = "CoreDB"; +static const char modname[] = "coreDB"; struct db_obj { switch_memory_pool_t *pool;

1 0

[commit] r3472 - in freeswitch/trunk/src/mod/languages: mod_spidermonkey mod_spidermonkey_core_db mod_spidermonkey_teletone
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: anthm Date: Tue Nov 28 15:52:04 2006 New Revision: 3472 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Log: fix a few js issues Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Nov 28 15:52:04 2006 @@ -409,7 +409,7 @@ } -static switch_status_t sm_load_file(char *filename, sm_loadable_module_t **new_module) +static switch_status_t sm_load_file(char *filename) { sm_loadable_module_t *module = NULL; apr_dso_handle_t *dso = NULL; @@ -424,7 +424,6 @@ assert(filename != NULL); - *new_module = NULL; status = apr_dso_load(&dso, filename, module_manager.pool); while (loading) { @@ -447,7 +446,7 @@ break; } - if ((module = switch_core_permanent_alloc(sizeof(sm_loadable_module_t))) == 0) { + if (!(module = (sm_loadable_module_t *) switch_core_permanent_alloc(sizeof(*module)))) { err = "Could not allocate memory\n"; break; } @@ -465,11 +464,10 @@ module->module_interface = module_interface; module->lib = dso; - *new_module = module; switch_core_hash_insert(module_manager.mod_hash, (char *) module->filename, (void *) module); - for (mp = module_interface; mp; mp = mp->next) { + for (mp = module->module_interface; mp; mp = mp->next) { switch_core_hash_insert(module_manager.load_hash, (char *)mp->name, (void *) mp); } @@ -484,7 +482,6 @@ switch_size_t len = 0; char *path; char *file; - sm_loadable_module_t *new_module = NULL; #ifdef WIN32 const char *ext = ".dll"; @@ -517,7 +514,7 @@ } } - return sm_load_file(path, &new_module); + return sm_load_file(path); } static switch_status_t load_modules(void) @@ -961,6 +958,13 @@ } } + if (argc > 4) { + int32 samps; + uint32_t pos = 0; + JS_ValueToInt32(cx, argv[4], &samps); + switch_core_file_seek(&fh, &pos, samps, SEEK_CUR); + } + memset(&fh, 0, sizeof(fh)); cb_state.extra = &fh; cb_state.ret = BOOLEAN_TO_JSVAL( JS_FALSE ); @@ -1214,13 +1218,13 @@ char *app_name = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); char *app_arg = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); struct js_session *jss = JS_GetPrivate(cx, obj); - jsrefcount saveDepth; + //jsrefcount saveDepth; if ((application_interface = switch_loadable_module_get_application_interface(app_name))) { if (application_interface->application_function) { - saveDepth = JS_SuspendRequest(cx); + //saveDepth = JS_SuspendRequest(cx); application_interface->application_function(jss->session, app_arg); - JS_ResumeRequest(cx, saveDepth); + //JS_ResumeRequest(cx, saveDepth); retval = JS_TRUE; } } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_core_db/mod_spidermonkey_core_db.c Tue Nov 28 15:52:04 2006 @@ -31,7 +31,7 @@ */ #include "mod_spidermonkey.h" -static const char modname[] = "DB"; +static const char modname[] = "CoreDB"; struct db_obj { switch_memory_pool_t *pool; @@ -148,10 +148,9 @@ { struct db_obj *dbo = JS_GetPrivate(cx, obj); *rval = BOOLEAN_TO_JSVAL( JS_FALSE ); - - if (dbo->stmt) { - int running = 1; + if (dbo->stmt) { + int running = 1; while (running < 5000) { int result = switch_core_db_step(dbo->stmt); if (result == SQLITE_ROW) { @@ -210,10 +209,9 @@ dbo->stmt = NULL; } - if (argc > 0) { + if (argc > 0) { char *sql = JS_GetStringBytes(JS_ValueToString(cx, argv[0])); - - if(switch_core_db_prepare(dbo->db, sql, 0, &dbo->stmt, 0)) { + if(switch_core_db_prepare(dbo->db, sql, -1, &dbo->stmt, 0)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s\n", switch_core_db_errmsg(dbo->db)); } else { *rval = BOOLEAN_TO_JSVAL( JS_TRUE ); @@ -266,18 +264,14 @@ } JSClass db_class = { - "DB", JSCLASS_HAS_PRIVATE, + modname, JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub, db_getProperty, JS_PropertyStub, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, db_destroy, NULL, NULL, NULL, db_construct }; - - - - -switch_status_t spidermonkey_load(JSContext *cx, JSObject *obj) +switch_status_t db_load(JSContext *cx, JSObject *obj) { JS_InitClass(cx, @@ -291,14 +285,13 @@ db_props, db_methods ); - return SWITCH_STATUS_SUCCESS; } const sm_module_interface_t DB_module_interface = { /*.name = */ modname, - /*.spidermonkey_load*/ spidermonkey_load, + /*.spidermonkey_load*/ db_load, /*.next*/ NULL }; Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey_teletone/mod_spidermonkey_teletone.c Tue Nov 28 15:52:04 2006 @@ -357,7 +357,7 @@ }; -switch_status_t spidermonkey_load(JSContext *cx, JSObject *obj) +switch_status_t teletone_load(JSContext *cx, JSObject *obj) { JS_InitClass(cx, obj, @@ -376,7 +376,7 @@ const sm_module_interface_t teletone_module_interface = { /*.name = */ modname, - /*.spidermonkey_load*/ spidermonkey_load, + /*.spidermonkey_load*/ teletone_load, /*.next*/ NULL };

1 0

[commit] r3471 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: ptinsley Date: Tue Nov 28 15:20:22 2006 New Revision: 3471 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: Fix a few overflow problems Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Nov 28 15:20:22 2006 @@ -579,9 +579,9 @@ holder.print_title = 0; if ((cmdname = strchr(cmd, ' ')) != 0) { *cmdname++ = '\0'; - sprintf (sql, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); + snprintf (sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api' and name = '%s'", cmdname); } else { - sprintf (sql, "select name, syntax, description from interfaces where type = 'api'"); + snprintf (sql, sizeof(sql) - 1, "select name, syntax, description from interfaces where type = 'api'"); } } else { stream->write_function(stream, "USAGE: %s\n", show_api_interface.syntax); @@ -633,7 +633,7 @@ sprintf (showcmd, "help"); all = 1; } else { - sprintf (showcmd, "help %s", cmd); + snprintf(showcmd, sizeof(showcmd) -1, "help %s", cmd); } if (all) {

1 0

[commit] r3470 - freeswitch/trunk/src/mod/applications/mod_commands
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: ptinsley Date: Tue Nov 28 14:33:54 2006 New Revision: 3470 Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Log: Get rid of the hard coded console help output, and add an api version command for fun. Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Tue Nov 28 14:33:54 2006 @@ -26,12 +26,14 @@ * Anthony Minessale II <anthmct(a)yahoo.com> * Michael Jerris <mike(a)jerris.com> * Johny Kadarisman <jkr888(a)gmail.com> + * Paul Tinsley <jackhammer(a)gmail.com> * * * mod_commands.c -- Misc. Command Module * */ #include <switch.h> +#include <switch_version.h> static const char modname[] = "mod_commands"; static switch_api_interface_t ctl_api_interface; @@ -614,6 +616,15 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t version_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) +{ + char version_string[1024]; + snprintf(version_string, sizeof(version_string) - 1, "FreeSwitch Version %s\n", SWITCH_VERSION_FULL); + + stream->write_function(stream, version_string); + return SWITCH_STATUS_SUCCESS; +} + static switch_status_t help_function(char *cmd, switch_core_session_t *session, switch_stream_handle_t *stream) { char showcmd[1024]; @@ -631,19 +642,23 @@ show_function(showcmd, session, stream); - if (all) { - stream->write_function(stream, "version\n" "shutdown - stop the program\n"); - } - return SWITCH_STATUS_SUCCESS; } +static switch_api_interface_t version_api_interface = { + /*.interface_name */ "version", + /*.desc */ "Show version of the switch", + /*.function */ version_function, + /*.syntax */ "", + /*.next */ NULL +}; + static switch_api_interface_t help_api_interface = { /*.interface_name */ "help", /*.desc */ "Show help for all the api commands", /*.function */ help_function, /*.syntax */ "", - /*.next */ NULL + /*.next */ &version_api_interface, }; static switch_api_interface_t ctl_api_interface = {

1 0