[Astpp-commit] SF.net SVN: astpp:[2324] trunk
Brought to you by:
darrenkw
|
From: <dar...@us...> - 2010-12-31 02:09:35
|
Revision: 2324
http://astpp.svn.sourceforge.net/astpp/?rev=2324&view=rev
Author: darrenkw
Date: 2010-12-31 02:09:29 +0000 (Fri, 31 Dec 2010)
Log Message:
-----------
Correct a couple of samples, fix spacing in ASTPP.pm, add perl modules to makefile.
Modified Paths:
--------------
trunk/Makefile
trunk/freeswitch/contrib/darren/conf/autoload_configs/acl.conf.xml
trunk/freeswitch/contrib/darren/conf/dialplan/default.xml
trunk/modules/ASTPP/lib/ASTPP.pm
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2010-12-30 02:47:26 UTC (rev 2323)
+++ trunk/Makefile 2010-12-31 02:09:29 UTC (rev 2324)
@@ -127,6 +127,7 @@
perl -MCPAN -e "install DBI";
perl -MCPAN -e "install DBD::mysql";
# perl -MCPAN -e "install DBD::Pg";
+ perl -MCPAN -e "install Params::Validate";
perl -MCPAN -e "install CGI";
perl -MCPAN -e "install Asterisk::AGI";
perl -MCPAN -e "install LWP::Simple";
@@ -140,7 +141,9 @@
perl -MCPAN -e "install Data::Paginate";
perl -MCPAN -e "install HTML::Template";
perl -MCPAN -e "install HTML::Template::Expr";
+ perl -MCPAN -e "install DateTime";
perl -MCPAN -e "install DateTime::TimeZone";
+ perl -MCPAN -e "install DateTime::Locale";
perl -MCPAN -e "install DateTime";
perl -MCPAN -e "install Locale::gettext_pp";
perl -MCPAN -e "install XML::Simple";
Modified: trunk/freeswitch/contrib/darren/conf/autoload_configs/acl.conf.xml
===================================================================
--- trunk/freeswitch/contrib/darren/conf/autoload_configs/acl.conf.xml 2010-12-30 02:47:26 UTC (rev 2323)
+++ trunk/freeswitch/contrib/darren/conf/autoload_configs/acl.conf.xml 2010-12-31 02:09:29 UTC (rev 2324)
@@ -1,29 +1,20 @@
<configuration name="acl.conf" description="Network Lists">
<network-lists>
- <list name="dl-candidates" default="allow">
- <node type="deny" cidr="10.0.0.0/8"/>
- <node type="deny" cidr="172.16.0.0/12"/>
- <node type="deny" cidr="192.168.0.0/16"/>
- </list>
- <list name="rfc1918" default="deny">
- <node type="allow" cidr="10.0.0.0/8"/>
- <node type="allow" cidr="172.16.0.0/12"/>
- <node type="allow" cidr="192.168.0.0/16"/>
- </list>
+ <!--
+ These ACL's are automatically created on startup.
- <list name="lan" default="allow">
- <node type="deny" cidr="192.168.42.0/24"/>
- <node type="allow" cidr="192.168.42.42/32"/>
- </list>
+ rfc1918.auto - RFC1918 Space
+ nat.auto - RFC1918 Excluding your local lan.
+ localnet.auto - ACL for your local lan.
+ loopback.auto - ACL for your local lan.
+ -->
- <list name="strict" default="deny">
- <node type="allow" cidr="208.102.123.124/32"/>
+ <list name="domains" default="allow">
+ <node type="deny" cidr="1.2.3.0/24"/>
</list>
- <list name="domains" default="deny">
- <node type="allow" domain="$${domain}"/>
- </list>
</network-lists>
</configuration>
+
Modified: trunk/freeswitch/contrib/darren/conf/dialplan/default.xml
===================================================================
--- trunk/freeswitch/contrib/darren/conf/dialplan/default.xml 2010-12-30 02:47:26 UTC (rev 2323)
+++ trunk/freeswitch/contrib/darren/conf/dialplan/default.xml 2010-12-31 02:09:29 UTC (rev 2324)
@@ -257,7 +257,7 @@
</extension>
<extension name="astpp_callingcards">
- <condition field="destination_number" expression="^9912345$">
+ <condition field="destination_number" expression="^14357297148$">
<action application="answer"/>
<action application="eval" data="Here we go!"/>
<!-- <action application="lua" data="astpp_callingcards.lua"/> -->
Modified: trunk/modules/ASTPP/lib/ASTPP.pm
===================================================================
--- trunk/modules/ASTPP/lib/ASTPP.pm 2010-12-30 02:47:26 UTC (rev 2323)
+++ trunk/modules/ASTPP/lib/ASTPP.pm 2010-12-31 02:09:29 UTC (rev 2324)
@@ -354,8 +354,12 @@
if ($diddata->{extensions} =~ m/^("|)(L|l)ocal.*/m) {
my ($junk,$ext,$context) = split /,(?!(?:[^",]|[^"],[^"])+")/, $diddata->{extensions};
#jump to local dialplan
-$ext =~ s/"//mg;
-$context =~ s/"//mg;
+ print STDERR "EXT: $ext\n" if $arg{debug} == 1;
+ $ext =~ s/"//mg;
+ print STDERR "EXT: $ext \n" if $arg{debug} == 1;
+ print STDERR "CONTEXT: $context\n" if $arg{debug} == 1;
+ $context =~ s/"//mg;
+ print STDERR "CONTEXT: $context \n" if $arg{debug} == 1;
$xml .= "<action application=\"transfer\" data=\"" . $ext ." XML " .$context . "\"/>\n";
} else {
$xml .= "<action application=\"bridge\" data=\"" . $diddata->{extensions} . "\"/>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|