June 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5484 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 28 Jun '07

28 Jun '07

Author: anthm Date: Thu Jun 28 11:00:47 2007 New Revision: 5484 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: small fix Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Jun 28 11:00:47 2007 @@ -870,7 +870,7 @@ tech_pvt->remote_ip, tech_pvt->remote_port, tech_pvt->codec_num, - tech_pvt->read_codec.implementation->encoded_bytes_per_frame, + tech_pvt->read_codec.implementation->samples_per_frame, tech_pvt->read_codec.implementation->microseconds_per_frame, flags, NULL, tech_pvt->profile->timer_name, &err, switch_core_session_get_pool(tech_pvt->session)))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP ERROR %s\n", err);

1 0

[commit] r5483 - freeswitch/trunk/src
by Freeswitch SVN 28 Jun '07

28 Jun '07

Author: anthm Date: Thu Jun 28 10:47:58 2007 New Revision: 5483 Modified: freeswitch/trunk/src/switch_loadable_module.c Log: update Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu Jun 28 10:47:58 2007 @@ -1226,6 +1226,8 @@ last = name = next = cur = buf; for (;;) { + + if (!next) { break; } @@ -1233,10 +1235,11 @@ *p++ = '\0'; } next = p; + if (cur != name) { if (strchr(cur, 'i')) { interval = atoi(cur); - } else if (strchr(cur, 'k' || strchr(cur, 'h'))) { + } else if ((strchr(cur, 'k') || strchr(cur, 'h'))) { rate = atoi(cur); } }

1 0

[commit] r5482 - freeswitch/trunk/src/mod/endpoints/mod_dingaling
by Freeswitch SVN 28 Jun '07

28 Jun '07

Author: anthm Date: Thu Jun 28 10:29:11 2007 New Revision: 5482 Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Log: update Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c Thu Jun 28 10:29:11 2007 @@ -687,7 +687,7 @@ tech_pvt = switch_core_session_get_private(*session); - if (!tech_pvt || !switch_test_flag(tech_pvt, TFLAG_READY)) { + if (!switch_core_session_running(*session) && (!tech_pvt || !switch_test_flag(tech_pvt, TFLAG_READY))) { switch_core_session_destroy(session); return; }

1 0

[commit] r5480 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 27 Jun '07

27 Jun '07

Author: greenlizard Date: Wed Jun 27 13:25:54 2007 New Revision: 5480 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Log: re-added default install path in addition to SWIFT_HOME Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Wed Jun 27 13:25:54 2007 @@ -1,6 +1,6 @@ -LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -lswift -lceplex_us -lceplang_en -lm" ; fi ; +LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm" ; fi ; -LOCAL_INSERT_CFLAGS=test $$osarch = "Darwin" || echo "-I$(SWIFT_HOME)/include"; +LOCAL_INSERT_CFLAGS=test $$osarch = "Darwin" || echo "-I$(SWIFT_HOME)/include -I/opt/swift/include"; LOCAL_CFLAGS=-w include ../../../../build/modmake.rules

1 0

[commit] r5479 - freeswitch/trunk/src/mod/asr_tts/mod_cepstral
by Freeswitch SVN 27 Jun '07

27 Jun '07

Author: greenlizard Date: Wed Jun 27 13:17:24 2007 New Revision: 5479 Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Log: Use SWIFT_HOME environment variable instead of hardcoded path Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/Makefile Wed Jun 27 13:17:24 2007 @@ -1,6 +1,6 @@ -LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L/opt/swift/lib -lswift -lceplex_us -lceplang_en -lm" ; fi ; +LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -lswift -lceplex_us -lceplang_en -lm" ; fi ; -LOCAL_INSERT_CFLAGS=test $$osarch = "Darwin" || echo "-I/opt/swift/include"; +LOCAL_INSERT_CFLAGS=test $$osarch = "Darwin" || echo "-I$(SWIFT_HOME)/include"; LOCAL_CFLAGS=-w include ../../../../build/modmake.rules

1 0

[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

[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

[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

[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

[commit] r5466 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by Freeswitch SVN 26 Jun '07

26 Jun '07

Author: anthm Date: Mon Jun 25 21:22:15 2007 New Revision: 5466 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Log: remove extraneous ASS Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/pablio.c Mon Jun 25 21:22:15 2007 @@ -129,7 +129,6 @@ if (numBytes > 0) { if (switch_core_timer_check(timer) == SWITCH_STATUS_SUCCESS) { PaUtil_FlushRingBuffer(&aStream->outFIFO); - printf("ASS\n"); return 0; } switch_yield(1000);

1 0