diff options
| -rw-r--r-- | config/freeswitch/freeswitch.inc | 56 | ||||
| -rw-r--r-- | config/freeswitch/freeswitch.xml | 2 | ||||
| -rw-r--r-- | config/freeswitch/freeswitch_gateways_edit.tmp | 8 | ||||
| -rwxr-xr-x | pkg_config.7.xml | 2 |
4 files changed, 42 insertions, 26 deletions
diff --git a/config/freeswitch/freeswitch.inc b/config/freeswitch/freeswitch.inc index fd7a2041..4a6546eb 100644 --- a/config/freeswitch/freeswitch.inc +++ b/config/freeswitch/freeswitch.inc @@ -535,9 +535,24 @@ function sync_package_freeswitch_gateways() if (strlen($rowhelper['register']) > 0) { $tmpxml .= " <param name=\"register\" value=\"" . $rowhelper['register'] . "\"/>\n"; } + if (strlen($rowhelper['register-transport']) > 0) { - $tmpxml .= " <param name=\"register-transport\" value=\"" . $rowhelper['register-transport'] . "\"/>\n"; - } + switch ($rowhelper['register-transport']) { + case "udp": + $tmpxml .= " <param name=\"register-transport\" value=\"udp\"/>\n"; + break; + case "tcp": + $tmpxml .= " <param name=\"register-transport\" value=\"tcp\"/>\n"; + break; + case "tls": + $tmpxml .= " <param name=\"register-transport\" value=\"tls\"/>\n"; + $tmpxml .= " <param name=\"contact-params\" value=\"transport=tls\"/>\n"; + break; + default: + $tmpxml .= " <param name=\"register-transport\" value=\"" . $rowhelper['register-transport'] . "\"/>\n"; + } + } + if (strlen($rowhelper['retry-seconds']) > 0) { $tmpxml .= " <param name=\"retry-seconds\" value=\"" . $rowhelper['retry-seconds'] . "\"/>\n"; } @@ -1695,9 +1710,9 @@ function sync_package_freeswitch() function freeswitch_php_install_command() { global $config; - $freeswitch_package_version = "0.8.5.3"; - $freeswitch_build_version = "1.0.3"; - $freeswitch_build_revision = "12545"; + $freeswitch_package_version = "0.8.5.4"; + $freeswitch_build_version = "1.0.4 pre 6"; + $freeswitch_build_revision = "13238"; //set script execution time limit to 24 hours set_time_limit (86400); @@ -1734,23 +1749,23 @@ function freeswitch_php_install_command() unlink_if_exists("/usr/local/freeswitch/conf/dialplan/default/01_example.com.xml"); unlink_if_exists("/usr/local/freeswitch/conf/dialplan/public/00_inbound_did.xml"); - if (!is_dir('/usr/local/www/packages/freeswitch/sounds/custom/')) { - exec("mkdir /usr/local/www/packages/freeswitch/sounds/custom/"); + if (!is_dir('/usr/local/freeswitch/sounds/custom/')) { + exec("mkdir /usr/local/freeswitch/sounds/custom/"); } - if (!is_dir('/usr/local/www/packages/freeswitch/sounds/custom/8000/')) { - exec("mkdir /usr/local/www/packages/freeswitch/sounds/custom/8000/"); + if (!is_dir('/usr/local/freeswitch/sounds/custom/8000/')) { + exec("mkdir /usr/local/freeswitch/sounds/custom/8000/"); } //copy audio files - exec("cd /usr/local/www/packages/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/please_enter_your_pin_number.wav"); - exec("cd /usr/local/www/packages/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/please_enter_the_pin_number.wav"); - exec("cd /usr/local/www/packages/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/please_enter_the_extension_number.wav"); - exec("cd /usr/local/www/packages/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/please_enter_the_phone_number.wav"); - exec("cd /usr/local/www/packages/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/call_forward_has_been_set.wav"); - exec("cd /usr/local/www/packages/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/call_forward_has_been_deleted.wav"); - exec("cd /usr/local/www/packages/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/begin_recording.wav"); - exec("cd /usr/local/www/packages/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/your_pin_number_is_incorect_goodbye.wav"); + exec("cd /usr/local/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/please_enter_your_pin_number.wav"); + exec("cd /usr/local/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/please_enter_the_pin_number.wav"); + exec("cd /usr/local/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/please_enter_the_extension_number.wav"); + exec("cd /usr/local/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/please_enter_the_phone_number.wav"); + exec("cd /usr/local/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/call_forward_has_been_set.wav"); + exec("cd /usr/local/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/call_forward_has_been_deleted.wav"); + exec("cd /usr/local/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/begin_recording.wav"); + exec("cd /usr/local/freeswitch/sounds/custom/8000/;fetch http://www.pfsense.com/packages/config/freeswitch/your_pin_number_is_incorect_goodbye.wav"); //download lib files @@ -1763,12 +1778,6 @@ function freeswitch_php_install_command() exec("cd /usr/local/lib/;fetch http://www.pfsense.com/packages/config/freeswitch/libodbc.so.1"); exec("cd /usr/local/lib/;fetch http://www.pfsense.com/packages/config/freeswitch/libiconv.so.3"); - //rename .so files from .1 to .so - //exec("cp /tmp/mod_shout.so.1 /usr/local/freeswitch/mod/mod_shout.so"); - //unlink_if_exists("/tmp/mod_shout.so.tmp"); - - //exec("cp /tmp/mod_fax.so.1 /usr/local/freeswitch/mod/mod_fax.so"); - //unlink_if_exists("/tmp/mod_fax.so.tmp"); //download xml package files //exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch.inc"); @@ -1780,6 +1789,7 @@ function freeswitch_php_install_command() exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_public.xml"); exec("cd /usr/local/pkg/;fetch http://www.pfsense.com/packages/config/freeswitch/freeswitch_vars.xml"); + //rename PHP files from .tmp to .php exec("cd /tmp/;fetch http://www.pfsense.com/packages/config/freeswitch/class.smtp.tmp"); exec("cp /tmp/class.smtp.tmp /usr/local/www/packages/freeswitch/class.smtp.php"); diff --git a/config/freeswitch/freeswitch.xml b/config/freeswitch/freeswitch.xml index af395a9e..28450fe1 100644 --- a/config/freeswitch/freeswitch.xml +++ b/config/freeswitch/freeswitch.xml @@ -44,7 +44,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>FreeSWITCH Settings</name> - <version>0.8.5.3</version> + <version>0.8.5.4</version> <title>FreeSWITCH: Settings</title> <include_file>/usr/local/pkg/freeswitch.inc</include_file> <menu> diff --git a/config/freeswitch/freeswitch_gateways_edit.tmp b/config/freeswitch/freeswitch_gateways_edit.tmp index adeacff6..d2f52051 100644 --- a/config/freeswitch/freeswitch_gateways_edit.tmp +++ b/config/freeswitch/freeswitch_gateways_edit.tmp @@ -428,15 +428,21 @@ function show_advanced_config() { case "udp": echo " <option value='udp' selected='yes'>udp</option>\n"; echo " <option value='tcp'>tcp</option>\n"; + echo " <option value='tls'>tls</option>\n"; break; case "tcp": echo " <option value='udp'>udp</option>\n"; echo " <option value='tcp' selected='yes'>tcp</option>\n"; - + echo " <option value='tls'>tls</option>\n"; + case "tls": + echo " <option value='udp'>udp</option>\n"; + echo " <option value='tcp'>tcp</option>\n"; + echo " <option value='tls' selected='yes'>tls</option>\n"; break; default: echo " <option value='udp'>udp</option>\n"; echo " <option value='tcp'>tcp</option>\n"; + echo " <option value='tls'>tls</option>\n"; } echo " </select>\n"; ?> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 96684080..49d70269 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -92,7 +92,7 @@ <pkginfolink>http://doc.pfsense.org/index.php/FreeSWITCH</pkginfolink> <config_file>http://www.pfsense.com/packages/config/freeswitch/freeswitch.xml</config_file> <depends_on_package_base_url>http://files.pfsense.org/packages/7/All/</depends_on_package_base_url> - <version>0.8.5.3</version> + <version>0.8.5.4</version> <status>Beta</status> <required_version>1.2.1</required_version> <maintainer>markjcrane@gmail.com</maintainer> |