[Astpp-commit] SF.net SVN: astpp:[2240] trunk

[<dar...@us...>]

Revision: 2240
          http://astpp.svn.sourceforge.net/astpp/?rev=2240&view=rev
Author:   darrenkw
Date:     2009-03-07 22:38:22 +0000 (Sat, 07 Mar 2009)

Log Message:
-----------
Corrected freeswitch bridging code after adding support for returning the routing information in several formats.

Modified Paths:
--------------
    trunk/freeswitch/astpp-fs-xml.pl
    trunk/modules/ASTPP/lib/ASTPP.pm

Modified: trunk/freeswitch/astpp-fs-xml.pl
===================================================================
--- trunk/freeswitch/astpp-fs-xml.pl	2009-03-07 22:29:40 UTC (rev 2239)
+++ trunk/freeswitch/astpp-fs-xml.pl	2009-03-07 22:38:22 UTC (rev 2240)
@@ -244,11 +244,12 @@
             );
         }
         else {
-            $xml .= $ASTPP->fs_dialplan_xml_bridge(
+            my ($returned_data,$junk) = $ASTPP->fs_dialplan_xml_bridge(
                 destination_number => $params->{'Caller-Destination-Number'},
                 route_prepend      => $route->{prepend},
                 trunk_name         => $route->{trunk}
             );
+	    $xml .= $returned_data;
         }
     }
     }

Modified: trunk/modules/ASTPP/lib/ASTPP.pm
===================================================================
--- trunk/modules/ASTPP/lib/ASTPP.pm	2009-03-07 22:29:40 UTC (rev 2239)
+++ trunk/modules/ASTPP/lib/ASTPP.pm	2009-03-07 22:38:22 UTC (rev 2240)
@@ -152,7 +152,7 @@
 	}
     if ( $trunkdata->{tech} eq "Zap" ) {
 	$dialstring = "<action application=\"bridge\" data=\"openzap/" . $trunkdata->{path} . "/1/" . $arg{route_prepend} . $arg{destination_number} . "\"/>\n";
-        return $dialstring,$data;
+        return ($dialstring,$data);
     }
     elsif ( $trunkdata->{tech} eq "SIP" ) {
 	my ($profile,$dest) = split(m/","/m, $trunkdata->{path});
@@ -165,7 +165,7 @@
 		$data = "sofia/" . $profile . "/" . $arg{route_prepend} . $arg{destination_number} . "\@" . $dest;
 		$dialstring = "<action application=\"bridge\" data=\"" . $data . "\"/>\n";
 	}
-        return $dialstring,$data;
+        return ($dialstring,$data);
     }
     else {
 	print STDERR "CANNOT ROUTE THIS CALL!!!!!\n";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.