- Freeswitch-branches - FreeSWITCH Mailing Lists

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

29 Nov '06

Author: igorneves Date: Tue Nov 28 19:25:15 2006 New Revision: 3480 Modified: freeswitch/branches/igorneves/scripts/socket/fsconsole.pl Log: take out the "api..." no sense always showing that Modified: freeswitch/branches/igorneves/scripts/socket/fsconsole.pl ============================================================================== --- freeswitch/branches/igorneves/scripts/socket/fsconsole.pl (original) +++ freeswitch/branches/igorneves/scripts/socket/fsconsole.pl Tue Nov 28 19:25:15 2006 @@ -270,7 +270,8 @@ 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: '); +# no sense allways showing "api......." +# 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__'});

1 0

[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] r3468 - in freeswitch/branches/igorneves/scripts: . socket
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: igorneves Date: Tue Nov 28 14:07:23 2006 New Revision: 3468 Added: freeswitch/branches/igorneves/scripts/ freeswitch/branches/igorneves/scripts/socket/ freeswitch/branches/igorneves/scripts/socket/fs.pl Log: some new updates to fs.pl, improves usability Added: freeswitch/branches/igorneves/scripts/socket/fs.pl ============================================================================== --- (empty file) +++ freeswitch/branches/igorneves/scripts/socket/fs.pl Tue Nov 28 14:07:23 2006 @@ -0,0 +1,75 @@ +use FreeSWITCH::Client; +use Data::Dumper; +use Sys::Hostname; +use Term::ReadLine; + +my $password = "ClueCon"; + +$HISTFILE = ($ENV{HOME} || ((getpwuid($<))[7])) . "/.fs_history"; +$HISTSIZE = 256; + +my $fs = init FreeSWITCH::Client {-password => $password} or die "Error $@"; +my $term = new Term::ReadLine "FreeSWITCH CLI"; +my $prompt = hostname.">"; +my $OUT = $term->OUT .. \*STDOUT; + +my $log = shift; + +$term->stifle_history($HISTSIZE); +if (-f $HISTFILE) { + $term->ReadHistory($HISTFILE) + or warn "cannot read history file: $!\n"; +} + +$SIG{CHLD} = sub {$fs->disconnect(); die "done"}; + +if ($log) { + $pid = fork; + if (!$pid) { + my $fs2 = init FreeSWITCH::Client {-password => $password} or die "Error $@"; + + + $fs2->cmd({ command => "log $log" }); + while (1) { + my $reply = $fs2->readhash(undef); + if ($reply->{socketerror}) { + die "socket error"; + } + if ($reply->{body}) { + print $reply->{body} . "\n"; + } elsif ($reply->{'reply-text'}) { + print $reply->{'reply-text'} . "\n"; + } + } + exit; + } + +} + + + +while ( defined ($_ = $term->readline($prompt)) ) { + my $reply; + + if ($_) { + my $reply = $fs->cmd({command => "api $_"}); + if ($reply->{socketerror}) { + $fs2->disconnect(); + die "socket error"; + } + if ($reply->{body}) { + print $reply->{body}; + } elsif ($reply->{'reply-text'}) { + print $reply->{'reply-text'}; + } + print "\n"; + if ($_ =~ /exit/) { + last; + } + } + $term->addhistory($_) if /\S/; + $term->write_history($HISTFILE) + or warn "cannot write history file: $!\n"; + +} +

1 0

[commit] r3466 - freeswitch/branches/markross
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: sphere Date: Tue Nov 28 11:09:30 2006 New Revision: 3466 Added: freeswitch/branches/markross/ Log: Creating empty folder for markross

1 0

[commit] r3465 - freeswitch/branches/adminkg
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: sphere Date: Tue Nov 28 07:09:26 2006 New Revision: 3465 Added: freeswitch/branches/adminkg/ Log: Creating empty folder for adminkg

1 0

[commit] r3464 - freeswitch/branches/atirel
by Freeswitch SVN 28 Nov '06

28 Nov '06

Author: sphere Date: Tue Nov 28 06:25:23 2006 New Revision: 3464 Added: freeswitch/branches/atirel/ Log: Creating empty folder for atirel

1 0

[commit] r3459 - freeswitch/branches/compnetwork
by Freeswitch SVN 27 Nov '06

27 Nov '06

Author: sphere Date: Mon Nov 27 10:41:28 2006 New Revision: 3459 Added: freeswitch/branches/compnetwork/ Log: Creating empty folder for compnetwork

1 0

[commit] r3457 - in freeswitch/branches/mishehu/src/mod: endpoints endpoints/mod_opal event_handlers/mod_cdr
by Freeswitch SVN 26 Nov '06

26 Nov '06

Author: mishehu Date: Sun Nov 26 03:09:57 2006 New Revision: 3457 Added: freeswitch/branches/mishehu/src/mod/endpoints/ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/Makefile freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.cpp freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.h freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/mod_opal.cpp Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Log: Started working on the very base of mod_opal. Added: freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/Makefile ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/Makefile Sun Nov 26 03:09:57 2006 @@ -0,0 +1,23 @@ +CFLAGS += -I/usr/include/ptlib -I/usr/include/opal +LDFLAGS += -lopal -lpt + +CPPCC = g++ +OBJS= + +all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN) + +depends: + +$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(OBJS) $(MODNAME).cpp + $(CPPCC) $(CFLAGS) -fPIC -c $(MODNAME).cpp -o $(MODNAME).o + $(CPPCC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(OBJS) $(LDFLAGS) + + +%.o: %.cpp + $(CPPCC) -Wall -Werror -fPIC $(CFLAGS) -c -o $@ $< + +clean: + rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~ + +install: + cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod Added: freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.cpp Sun Nov 26 03:09:57 2006 @@ -0,0 +1,30 @@ +#include "baseopal.h" + +char BaseOPAL::*configfile = "mod_opal.conf"; + +BaseOPAL::BaseOPAL() +{ + memset(&globals, 0, sizeof(globals)); + switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); +} + +void BaseOPAL::load_config() +{ + if (!(xml = switch_xml_open_cfg(configfile, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return SWITCH_STATUS_TERM; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + + if (!strcmp(var, "foo")) { + foo = atoi(val); + } + + switch_xml_free(xml); + + return SWITCH_STATUS_SUCCESS; +} \ No newline at end of file Added: freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.h ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/baseopal.h Sun Nov 26 03:09:57 2006 @@ -0,0 +1,18 @@ +#include <ptlib.h> + +#include <opal/buildopts.h> + +#include <h323/h323.h> +#include <h323/gkclient.h> +#include <lids/lidep.h> +#include <lids/ixjlid.h> +#include <ptclib/pstun.h> + +class BaseOPAL : public OpalManager { + public: + BaseOPAL(); + void load_config(); + private: + switch_xml_t cfg, xml, settings, param; + static char *configfile; +}; \ No newline at end of file Added: freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/mod_opal.cpp ============================================================================== --- (empty file) +++ freeswitch/branches/mishehu/src/mod/endpoints/mod_opal/mod_opal.cpp Sun Nov 26 03:09:57 2006 @@ -0,0 +1,117 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Yossi Neiman <freeswitch AT cartissolutions.com> + * Brian West <brian.west(a)mac.com> + * + * + * + * mod_opal.cpp -- OPAL Endpoint Module + * + */ + +#include <switch.h> + +static const char modname[] = "mod_opal"; + +static switch_memory_pool_t *module_pool = NULL; +static int running = 1; + +static switch_loadable_module_interface_t opal_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ channel_endpoint_interface, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ NULL, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL +}; + +static const switch_state_handler_table_t channel_event_handlers = { + /*.on_init */ channel_on_init, + /*.on_ring */ channel_on_ring, + /*.on_execute */ channel_on_execute, + /*.on_hangup */ channel_on_hangup, + /*.on_loopback */ channel_on_loopback, + /*.on_transmit */ channel_on_transmit +}; + +static const switch_io_routines_t channel_io_routines = { + /*.outgoing_channel */ channel_outgoing_channel, + /*.answer_channel */ channel_answer_channel, + /*.read_frame */ channel_read_frame, + /*.write_frame */ channel_write_frame, + /*.kill_channel */ channel_kill_channel, + /*.waitfor_read */ channel_waitfor_read, + /*.waitfor_write */ channel_waitfor_write, + /*.send_dtmf */ channel_send_dtmf +}; + +static const switch_endpoint_interface_t channel_endpoint_interface = { + /*.interface_name */ "opal", + /*.io_routines */ &channel_io_routines, + /*.event_handlers */ &channel_event_handlers, + /*.private */ NULL, + /*.next */ NULL +}; + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + + if (switch_core_new_memory_pool(&module_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "OH OH no pool\n"); + return SWITCH_STATUS_TERM; + } + + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &opal_module_interface; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} + +/* + Called when the system shuts down +SWITCH_MOD_DECLARE(switch_status) switch_module_shutdown(void) +{ + return SWITCH_STATUS_SUCCESS; +} +*/ + +/* + If it exists, this is called in it's own thread when the module-load completes + If it returns anything but SWITCH_STATUS_TERM it will be called again automaticly +SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void) +{ + while(looping) + { + switch_yield(1000); + } + return SWITCH_STATUS_TERM; +} +*/ Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/cdrcontainer.cpp Sun Nov 26 03:09:57 2006 @@ -98,12 +98,19 @@ switch_mod_cdr_newchannel_t *newchannel; // = new switch_mod_cdr_newchannel_t; newchannel = 0; + const char *err; + switch_xml_t xml_root; + + if ((xml_root = switch_xml_open_root(1, &err))) { + switch_console_printf(SWITCH_CHANNEL_LOG,"Reloading the XML file...\n"); + switch_xml_free(xml_root); + } + if (!(xml = switch_xml_open_cfg(configfile, &cfg, NULL))) switch_console_printf(SWITCH_CHANNEL_LOG,"open of %s failed\n", configfile); else { BaseRegistry& registry(BaseRegistry::get()); - registry.reset_active(); for(BaseRegistry::iterator it = registry.active_begin(); it != registry.active_end(); ++it) { basecdr_creator func = *it; @@ -111,6 +118,8 @@ std::auto_ptr<BaseCDR> ptr(_ptr); ptr->disconnect(); } + + registry.reset_active(); for(BaseRegistry::iterator it = registry.begin(); it != registry.end(); ++it) { Modified: freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp ============================================================================== --- freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp (original) +++ freeswitch/branches/mishehu/src/mod/event_handlers/mod_cdr/mod_cdr.cpp Sun Nov 26 03:09:57 2006 @@ -119,6 +119,7 @@ switch_thread_rwlock_wrlock(cdr_rwlock); newcdrcontainer->reload(); switch_thread_rwlock_unlock(cdr_rwlock); + stream->write_function(stream, "XML Reloaded and mod_cdr reloaded.\n"); return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r3454 - freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 24 Nov '06

24 Nov '06

Author: knhor Date: Fri Nov 24 14:34:38 2006 New Revision: 3454 Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Log: change caller control mute, to only be mute, not deaf and mute. add the ability to operate on the last (oldest) member of the conference. Modified: freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/branches/knhor/trunk/src/mod/applications/mod_conference/mod_conference.c Fri Nov 24 14:34:38 2006 @@ -795,7 +795,7 @@ { if (switch_test_flag(member, MFLAG_CAN_SPEAK)) { conf_api_sub_mute(member, NULL, NULL); - conf_api_sub_deaf(member, NULL, NULL); +// conf_api_sub_deaf(member, NULL, NULL); } else { conf_api_sub_unmute(member, NULL, NULL); } @@ -2373,18 +2373,18 @@ /* API Interface Function sub-commands */ static api_command_t conf_api_sub_commands[] = { {"list", &conf_api_sub_list, 0, "<confname> list [delim <string>]"}, - {"energy", &conf_api_sub_energy, 1, "<confname> energy <member_id|all> [<newval>]"}, - {"volume in", &conf_api_sub_volume_in, 1, "<confname> volume_in <member_id|all> [<newval>]"}, - {"volume out", &conf_api_sub_volume_out, 1, "<confname> volume_out <member_id|all> [<newval>]"}, + {"energy", &conf_api_sub_energy, 1, "<confname> energy <member_id|all|last> [<newval>]"}, + {"volume in", &conf_api_sub_volume_in, 1, "<confname> volume_in <member_id|all|last> [<newval>]"}, + {"volume out", &conf_api_sub_volume_out, 1, "<confname> volume_out <member_id|all|last> [<newval>]"}, {"play", &conf_api_sub_play, 0, "<confname> play <file_path> [<member_id>]"}, {"say", &conf_api_sub_say, 2, "<confname> say <text>"}, {"saymember", &conf_api_sub_saymember, 2, "<confname> saymember <member_id><text>"}, - {"stop", &conf_api_sub_stop, 1, "<confname> stop <[current|all]> [<member_id>]"}, - {"kick", &conf_api_sub_kick, 1, "<confname> kick <[member_id|all]>"}, - {"mute", &conf_api_sub_mute, 1, "<confname> mute <[member_id|all]>"}, - {"unmute", &conf_api_sub_unmute, 1, "<confname> unmute <[member_id|all]>"}, - {"deaf", &conf_api_sub_deaf, 1, "<confname> deaf <[member_id|all]>"}, - {"undeaf", &conf_api_sub_undeaf, 1, "<confname> undef <[member_id|all]>"}, + {"stop", &conf_api_sub_stop, 1, "<confname> stop <[current|all|last]> [<member_id>]"}, + {"kick", &conf_api_sub_kick, 1, "<confname> kick <[member_id|all|last]>"}, + {"mute", &conf_api_sub_mute, 1, "<confname> mute <[member_id|all]|last>"}, + {"unmute", &conf_api_sub_unmute, 1, "<confname> unmute <[member_id|all]|last>"}, + {"deaf", &conf_api_sub_deaf, 1, "<confname> deaf <[member_id|all]|last>"}, + {"undeaf", &conf_api_sub_undeaf, 1, "<confname> undef <[member_id|all]|last>"}, {"relate", &conf_api_sub_relate, 0, "<confname> relate <member_id> <other_member_id> [nospeak|nohear|clear]"}, {"lock", &conf_api_sub_lock, 0, "<confname> lock"}, {"unlock", &conf_api_sub_unlock, 0, "<confname> unlock"}, @@ -2429,7 +2429,7 @@ uint32_t cnum = atoi(argv[0]); conference_obj_t *conference = (cnum != 0 ? (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[0]) : NULL); - if(cnum == 0 || (cnum != 0 && conference != NULL)) { + if(cnum == 0 || (cnum != 0 && conference != NULL && argc >= 3)) { int argn = (cnum != 0 ? 1 : 0); // loop through the command table to find a match @@ -2450,9 +2450,32 @@ { uint32_t id = atoi(argv[argn+1]); int all = ( id == 0 && strcasecmp(argv[argn+1], "all") == 0 ); + int last = ( id == 0 && strcasecmp(argv[argn+1], "last") == 0 ); if(all) { conference_member_itterator(conference, stream, conf_api_sub_commands[i].pfnapicmd, argv[argn+2]); + } else if (last) { + conference_member_t *member = NULL; + conference_member_t *last_member = NULL; + + switch_mutex_lock(conference->member_mutex); + + // find last (oldest) member + member = conference->members; + while (member != NULL) { + if (last_member == NULL || member->id > last_member->id) { + last_member = member; + } + member = member->next; + } + + // exec functio on last (oldest) member + if (last_member != NULL) { + conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; + pfn(last_member, stream, argv[argn+2]); + } + + switch_mutex_unlock(conference->member_mutex); } else { conf_api_member_cmd_t pfn = (conf_api_member_cmd_t)conf_api_sub_commands[i].pfnapicmd; conference_member_t *member = conference_member_get(conference, id); @@ -2493,7 +2516,11 @@ stream->write_function(stream, "Confernece command '%s' not found.\nTry 'help conference'\n", argv[argn]); } } else { - stream->write_function(stream,"No Conference called %s found.\n",argv[0]); + if (argc < 3) { + stream->write_function(stream,"Conference argument required\n"); + } else { + stream->write_function(stream,"No Conference called %s found.\n",argv[0]); + } } } else {

1 0

[commit] r3453 - freeswitch/branches/voltsmith
by Freeswitch SVN 24 Nov '06

24 Nov '06

Author: sphere Date: Fri Nov 24 12:16:27 2006 New Revision: 3453 Added: freeswitch/branches/voltsmith/ Log: Creating empty folder for voltsmith

1 0