June 2007 - freeswitch-svn@lists.freeswitch.org

[Freeswitch-svn] [commit] r5476 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: trixter Date: Tue Jun 26 17:25:29 2007 New Revision: 5476 Modified: freeswitch/trunk/scripts/contrib/trixter/regexptest.pl Log: updated to make output better Modified: freeswitch/trunk/scripts/contrib/trixter/regexptest.pl ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/regexptest.pl (original) +++ freeswitch/trunk/scripts/contrib/trixter/regexptest.pl Tue Jun 26 17:25:29 2007 @@ -11,10 +11,13 @@ chomp($value); if ($value =~ m/$regexp/) { - print "Regexp matches\n"; + print "$value matches $regexp\n"; $x=1; while (defined $$x) { print "capture $x: $$x\n"; $x++; } +} else { + print "$value does not match $regexp\n"; } +

1 0

[Freeswitch-svn] [commit] r5475 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: trixter Date: Tue Jun 26 17:19:24 2007 New Revision: 5475 Added: freeswitch/trunk/scripts/contrib/trixter/regexptest.pl (contents, props changed) Log: added a simple commandline perl regexp tester, useful for testing those wacky dialplan regexps Added: freeswitch/trunk/scripts/contrib/trixter/regexptest.pl ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/contrib/trixter/regexptest.pl Tue Jun 26 17:19:24 2007 @@ -0,0 +1,20 @@ +#!/usr/bin/perl +# -*- mode:cperl; tab-width:4; c-basic-offset:4; c-indent-level:4; indent-tabs-mode:nil; -*- + + +print "Enter the regexp you wish to test: "; +$regexp = <STDIN>; +chomp($regexp); + +print "Enter the value you wish to test: "; +$value = <STDIN>; +chomp($value); + +if ($value =~ m/$regexp/) { + print "Regexp matches\n"; + $x=1; + while (defined $$x) { + print "capture $x: $$x\n"; + $x++; + } +}

1 0

[Freeswitch-svn] [commit] r5474 - freeswitch/branches/spditner/trunk/src
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: spditner Date: Tue Jun 26 13:11:35 2007 New Revision: 5474 Modified: freeswitch/branches/spditner/trunk/src/switch_ivr.c Log: Patch to allow transfers to work when hangup_after_bridge=true Modified: freeswitch/branches/spditner/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/branches/spditner/trunk/src/switch_ivr.c (original) +++ freeswitch/branches/spditner/trunk/src/switch_ivr.c Tue Jun 26 13:11:35 2007 @@ -897,8 +897,14 @@ switch_core_session_rwunlock(other_session); } - if ((uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE)) - && (other_session = switch_core_session_locate(uuid))) { + /* If HANGUP_AFTER_BRIDGE is set to 'true', SWITCH_SIGNAL_BRIDGE_VARIABLE + * will not have a value, so we need to check SWITCH_BRIDGE_VARIABLE */ + uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BRIDGE_VARIABLE); + if(!uuid) { + uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE); + } + + if (uuid && (other_session = switch_core_session_locate(uuid))) { other_channel = switch_core_session_get_channel(other_session); assert(other_channel != NULL); @@ -908,6 +914,10 @@ switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL); switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL); + /* If we are transferring the CALLER out of the bridge, we do not want + to hang up on them */ + switch_channel_set_variable(channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE, "false"); + switch_channel_hangup(other_channel, SWITCH_CAUSE_BLIND_TRANSFER); switch_ivr_media(uuid, SMF_NONE);

1 0

[Freeswitch-svn] [commit] r5473 - freeswitch/branches/spditner/trunk
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: spditner Date: Tue Jun 26 12:45:18 2007 New Revision: 5473 Added: freeswitch/branches/spditner/trunk/ - copied from r5472, /freeswitch/trunk/ Log: Creating private branch

1 0

[Freeswitch-svn] [commit] r5472 - freeswitch/branches/spditner/trunk
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: spditner Date: Tue Jun 26 12:43:57 2007 New Revision: 5472 Removed: freeswitch/branches/spditner/trunk/ Log: hmm, still wrong

1 0

[Freeswitch-svn] [commit] r5471 - freeswitch/branches/spditner/trunk
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: spditner Date: Tue Jun 26 12:39:43 2007 New Revision: 5471 Added: freeswitch/branches/spditner/trunk/ - copied from r5470, /freeswitch/trunk/ Log: Creating private branch

1 0

[Freeswitch-svn] [commit] r5470 - freeswitch/branches/spditner/trunk
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: spditner Date: Tue Jun 26 12:39:23 2007 New Revision: 5470 Removed: freeswitch/branches/spditner/trunk/ Log: Woops, forgot a trailing slash

1 0

[Freeswitch-svn] [commit] r5469 - freeswitch/branches/spditner/trunk
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: spditner Date: Tue Jun 26 12:33:36 2007 New Revision: 5469 Added: freeswitch/branches/spditner/trunk/ - copied from r5468, /freeswitch/trunk/ Log: Creating private branch

1 0

[Freeswitch-svn] [commit] r5468 - freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: cparker Date: Tue Jun 26 11:32:12 2007 New Revision: 5468 Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/Makefile.am Log: Remove extraneous -l from CFLAGS macro to quiet a linker complaint Modified: freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/Makefile.am (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_radius_cdr/Makefile.am Tue Jun 26 11:32:12 2007 @@ -13,7 +13,7 @@ MODNAME=mod_radius_cdr mod_LTLIBRARIES = mod_radius_cdr.la mod_radius_cdr_la_SOURCES = mod_radius_cdr.c -mod_radius_cdr_la_CFLAGS = $(AM_CFLAGS) -l +mod_radius_cdr_la_CFLAGS = $(AM_CFLAGS) mod_radius_cdr_la_CPPFLAGS = $(AM_CPPFLAGS) mod_radius_cdr_la_LIBADD=$(switch_builddir)/libfreeswitch.la mod_radius_cdr_la_LDFLAGS=-module -avoid-version -no-undefined

1 0

[Freeswitch-svn] [commit] r5467 - freeswitch/trunk/scripts/contrib/trixter
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: trixter Date: Tue Jun 26 01:36:01 2007 New Revision: 5467 Modified: freeswitch/trunk/scripts/contrib/trixter/conf-dtmf.pl Log: updated conf-dtmf.pl to reconnect with unpatched Client.pm Modified: freeswitch/trunk/scripts/contrib/trixter/conf-dtmf.pl ============================================================================== --- freeswitch/trunk/scripts/contrib/trixter/conf-dtmf.pl (original) +++ freeswitch/trunk/scripts/contrib/trixter/conf-dtmf.pl Tue Jun 26 01:36:01 2007 @@ -1,4 +1,5 @@ #!/usr/bin/perl +# -*- mode:cperl; tab-width:4; c-basic-offset:4; c-indent-level:4; indent-tabs-mode:nil; -*- use FreeSWITCH::Client; use POSIX ':signal_h'; # used for alarm to ensure we get heartbeats use Data::Dumper; # used to print out myhash debug info @@ -12,9 +13,9 @@ # hash for music, default must be defined, if you define other entities then the conference name will be used to match against that my %soundfile = ( - 'default' => '/sounds/fpm-calm-river.wav', - '123' => '/sounds/welcome.raw', - ); + 'default' => '/sounds/fpm-calm-river.wav', + '123' => '/sounds/welcome.raw', + ); @@ -25,31 +26,35 @@ my $lastheartbeat; - # this connects to the event socket sub es_connect() -{ + { print "Connecting to $host:$port\n"; - $fs = init FreeSWITCH::Client {-password => $password, -host => $host, -port => $port}; - if(defined $fs) { - $fs->sendmsg({'command' => 'event plain heartbeat CUSTOM conference::maintenence'}); - $lastheartbeat = time; + eval { + $fs = init FreeSWITCH::Client {-password => $password, -host => $host, -port => $port}; + if(defined $fs) { + $fs->sendmsg({'command' => 'event plain heartbeat CUSTOM conference::maintenence'}); + $lastheartbeat = time; + } + } or do { + print "Error connecting - waiting for retry\n"; } -} + + } sigaction SIGALRM, new POSIX::SigAction sub { - if ($lastheartbeat < (time - $timeout)) { + if ($lastheartbeat < (time - $timeout)) { print "Did not receive a heartbeat in the specified timeout\n"; if (defined $fs) { - $fs->disconnect(); - undef $fs; + $fs->disconnect(); + undef $fs; } es_connect(); - } - - # reset the alarm - alarm $timeout; + } + + # reset the alarm + alarm $timeout; } or die "Error setting SIGALRM handler: $!\n"; @@ -59,36 +64,37 @@ while (1) { if(defined $fs) { - my $reply = $fs->readhash(undef); - if ($reply->{socketerror}) { + my $reply = $fs->readhash(undef); + if ($reply->{socketerror}) { es_connect(); - } + } - if ($reply->{body}) { + if ($reply->{body}) { $myhash = $reply->{event}; - + if ($myhash->{'event-name'} eq "HEARTBEAT") { ## Deal with heartbeats - $lastheartbeat = time; - print "Got a heartbeat\n"; - + $lastheartbeat = time; + print "Got a heartbeat\n"; + } elsif ($myhash->{'event-subclass'} eq "conference::maintenence") { ## deal with Conference stuff - - if($myhash->{'action'} eq 'dtmf') { ## DTMF event + + if($myhash->{'action'} eq 'dtmf') { ## DTMF event print "conf: $myhash->{'conference-name'}\tmember: $myhash->{'member-id'}\tDTMF: $myhash->{'dtmf-key'}\n"; if(defined $soundfile{$myhash->{'conference-name'}}) { - $fs->sendmsg({'command' => "api conference $myhash->{'conference-name'} play $soundfile{$myhash->{'conference-name'}}"}); + $fs->sendmsg({'command' => "api conference $myhash->{'conference-name'} play $soundfile{$myhash->{'conference-name'}}"}); } else { - $fs->sendmsg({'command' => "api conference $myhash->{'conference-name'} play $soundfile{'default'}"}); + $fs->sendmsg({'command' => "api conference $myhash->{'conference-name'} play $soundfile{'default'}"}); } - } else { ## Just print out all other events + } else { ## Just print out all other events print "conf: $myhash->{'conference-name'}\tmemid: $myhash->{'member-id'}\taction: $myhash->{'action'}\tCLID: $myhash->{'caller-caller-id-number'}\n"; - } + } } else { ## Unknown event - print Dumper $myhash; -# print "$reply->{body}\n"; # print out what was sent, myhash is translated by Client.pm + print Dumper $myhash; + # print "$reply->{body}\n"; # print out what was sent, myhash is translated by Client.pm } - } + } } } +

1 0