diff options
| -rw-r--r-- | config/siproxd.inc | 44 | ||||
| -rw-r--r-- | config/siproxd.xml | 22 |
2 files changed, 33 insertions, 33 deletions
diff --git a/config/siproxd.inc b/config/siproxd.inc index e8bfb4f7..9582ac42 100644 --- a/config/siproxd.inc +++ b/config/siproxd.inc @@ -27,7 +27,7 @@ POSSIBILITY OF SUCH DAMAGE. */ -if(!function_exists("filter_configure")) +if(!function_exists("filter_configure")) require_once("filter.inc"); function sync_package_sipproxd_users() { @@ -53,7 +53,7 @@ function siproxd_generate_rules($type) { log_error("Sipproxd is installed but not started. Not installing redirect rules."); return; } - + /* proxy is turned off in package settings */ if($siproxd_conf['rtpenable'] == "0") { log_error("WARNING: siproxd RTP proxy has not been enabled. Not installing rules."); @@ -74,7 +74,7 @@ function siproxd_generate_rules($type) { $rules .= "rdr on {$iface} proto udp from any to !($iface) port {$port} -> 127.0.0.1 port {$port}\n"; } break; - case 'filter': + case 'filter': case 'rule': foreach ($ifaces as $iface) { if($iface <> "") { @@ -93,7 +93,7 @@ function siproxd_generate_rules($type) { } function sync_package_siproxd() { - global $config; + global $config; conf_mount_rw(); @@ -122,7 +122,7 @@ function sync_package_siproxd() { if($siproxd_conf['if_outbound'] != "") { if(intval($config['version']) < 6 && $config['interfaces'][$siproxd_conf['if_outbound']]['ipaddr'] == "pppoe") { fwrite($fout, "if_outbound = ng0\n"); - } else { + } else { fwrite($fout, "if_outbound = " . convert_friendly_interface_to_real_interface_name($siproxd_conf['if_outbound']) . "\n"); } } @@ -156,22 +156,22 @@ function sync_package_siproxd() { fwrite($fout, "rtp_port_high = 7079\n"); } - if($siproxd_conf['rtptimeout'] != "") { + if($siproxd_conf['rtptimeout'] != "") { fwrite($fout, "rtp_timeout = " . $siproxd_conf['rtptimeout'] . "\n"); - } else { - fwrite($fout, "rtp_timeout = 300\n"); - } - - if($siproxd_conf['defaulttimeout'] != "") { - fwrite($fout, "default_expires = " . $siproxd_conf['defaulttimeout'] . "\n"); - } else { - fwrite($fout, "default_expires = 600\n"); - } - - if($siproxd_conf['authentication']) { - fwrite($fout, "proxy_auth_realm = Authentication_Realm\n"); + } else { + fwrite($fout, "rtp_timeout = 300\n"); + } + + if($siproxd_conf['defaulttimeout'] != "") { + fwrite($fout, "default_expires = " . $siproxd_conf['defaulttimeout'] . "\n"); + } else { + fwrite($fout, "default_expires = 600\n"); + } + + if($siproxd_conf['authentication']) { + fwrite($fout, "proxy_auth_realm = Authentication_Realm\n"); fwrite($fout, "proxy_auth_pwfile = /usr/local/etc/siproxd_passwd.cfg\n"); - } + } fwrite($fout, "debug_level = 0x00000000\n"); if($siproxd_conf['outboundproxyhost'] != "") { @@ -193,10 +193,10 @@ function sync_package_siproxd() { ) ); - exec("killall siproxd"); - + exec("killall siproxd"); + sleep(1); - + start_service("siproxd"); filter_configure(); diff --git a/config/siproxd.xml b/config/siproxd.xml index cabb5341..b6d33ae9 100644 --- a/config/siproxd.xml +++ b/config/siproxd.xml @@ -2,8 +2,8 @@ <!DOCTYPE packagegui SYSTEM "./schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?> <packagegui> - <copyright> - <![CDATA[ + <copyright> + <![CDATA[ /* $Id$ */ /* ========================================================================== */ /* @@ -36,11 +36,11 @@ POSSIBILITY OF SUCH DAMAGE. */ /* ========================================================================== */ - ]]> - </copyright> - <description>Describe your package here</description> - <requirements>Describe your package requirements here</requirements> - <faq>Currently there are no FAQ items provided.</faq> + ]]> + </copyright> + <description>Describe your package here</description> + <requirements>Describe your package requirements here</requirements> + <faq>Currently there are no FAQ items provided.</faq> <name>siproxdsettings</name> <version>0.5.13_pfs2</version> <title>siproxd: Settings</title> @@ -70,14 +70,14 @@ </tabs> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>077</chmod> + <chmod>077</chmod> <item>http://www.pfsense.com/packages/config/siproxdusers.xml</item> </additional_files_needed> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>077</chmod> <item>http://www.pfsense.com/packages/config/siproxd.inc</item> - </additional_files_needed> + </additional_files_needed> <fields> <field> <fielddescr>Inbound interface</fielddescr> @@ -156,12 +156,12 @@ <type>input</type> </field> <field> - <fielddescr>Expedited Forwarding</fielddescr> + <fielddescr>Expedited RTP Forwarding</fielddescr> <fieldname>expeditedforwarding</fieldname> <description>This service is designed to allow ISPs to offer a service with attributes similar to a "leased line". This service offers the ULTIMATE IN LOW LOSS, LOW LATENCY AND LOW JITTER by ensuring that there is always sufficient room in output queues for the contracted expedited forwarding traffic. </description> <type>checkbox</type> - </field> + </field> </fields> <custom_php_global_functions> </custom_php_global_functions> |