aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2011-12-06 12:03:53 -0800
committerChris Buechler <cmb@pfsense.org>2011-12-06 12:03:53 -0800
commitf98adf1414e67696d3d51be21d833b7703ae9c45 (patch)
tree7d1d6bcb2e1b40ac65c6e9c1ca9a186780438bd3
parentd59adc5e18da33e14fcc299f754cdbddbbb0a3d3 (diff)
parent3b0730f14734da787f673bd81260f7c65f8c882e (diff)
downloadpfsense-packages-f98adf1414e67696d3d51be21d833b7703ae9c45.tar.gz
pfsense-packages-f98adf1414e67696d3d51be21d833b7703ae9c45.tar.bz2
pfsense-packages-f98adf1414e67696d3d51be21d833b7703ae9c45.zip
Merge pull request #122 from mdima/master
Patch for the previous change
-rw-r--r--config/snort/snort.inc14
-rw-r--r--config/snort/snort_define_servers.php10
-rw-r--r--config/snort/snort_interfaces_edit.php4
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 16 insertions, 16 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 36f58760..98d7ebfa 100644
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -37,7 +37,7 @@ require_once("functions.inc");
require_once("filter.inc");
/* package version */
-$snort_package_version = 'Snort 2.9.1 pkg v. 2.0';
+$snort_package_version = 'Snort 2.9.1 pkg v. 2.0.2';
/* Allow additional execution time 0 = no limit. */
ini_set('max_execution_time', '9999');
@@ -1582,12 +1582,12 @@ function generate_snort_conf($id, $if_real, $snort_uuid)
else
$def_sip_proxy_ports_type = "$def_sip_proxy_ports_info_chk";
- /* def SIP_IP */
- $def_sip_ip_info_chk = $snortcfg['def_sip_ip'];
- if ($def_sip_ip_info_chk == "")
- $def_sip_ip_type = "\$HOME_NET";
+ /* def SIP_SERVERS */
+ $def_sip_servers_info_chk = $snortcfg['def_sip_servers'];
+ if ($def_sip_servers_info_chk == "")
+ $def_sip_servers_type = "\$HOME_NET";
else
- $def_sip_ip_type = "$def_sip_ip_info_chk";
+ $def_sip_servers_type = "$def_sip_servers_info_chk";
/* def SIP_PORTS */
$def_sip_ports_info_chk = $snortcfg['def_sip_ports'];
@@ -1978,7 +1978,7 @@ var IMAP_SERVERS [{$def_imap_servers_type}]
var RPC_SERVERS \$HOME_NET
var WWW_SERVERS [{$def_www_servers_type}]
var SIP_PROXY_IP [{$def_sip_proxy_ip_type}]
-var SIP_IP [{$def_sip_ip_type}]
+var SIP_SERVERS [{$def_sip_servers_type}]
var AIM_SERVERS \
[64.12.24.0/23,64.12.28.0/23,64.12.161.0/24,64.12.163.0/24,64.12.200.0/24,205.188.3.0/24,205.188.5.0/24,205.188.7.0/24,205.188.9.0/24,205.188.153.0/24,205.188.179.0/24,205.188.248.0/24]
diff --git a/config/snort/snort_define_servers.php b/config/snort/snort_define_servers.php
index 45264995..6ffbc797 100644
--- a/config/snort/snort_define_servers.php
+++ b/config/snort/snort_define_servers.php
@@ -88,7 +88,7 @@ if (isset($id) && $a_nat[$id]) {
$pconfig['def_imap_servers'] = $a_nat[$id]['def_imap_servers'];
$pconfig['def_imap_ports'] = $a_nat[$id]['def_imap_ports'];
$pconfig['def_sip_proxy_ip'] = $a_nat[$id]['def_sip_proxy_ip'];
- $pconfig['def_sip_servers_ip'] = $a_nat[$id]['def_sip_servers_ip'];
+ $pconfig['def_sip_servers'] = $a_nat[$id]['def_sip_servers'];
$pconfig['def_sip_ports'] = $a_nat[$id]['def_sip_ports'];
$pconfig['def_sip_proxy_ports'] = $a_nat[$id]['def_sip_proxy_ports'];
$pconfig['def_auth_ports'] = $a_nat[$id]['def_auth_ports'];
@@ -141,7 +141,7 @@ if ($_POST) {
if ($_POST['def_imap_ports'] != "") { $natent['def_imap_ports'] = $_POST['def_imap_ports']; }else{ $natent['def_imap_ports'] = ""; }
if ($_POST['def_sip_proxy_ip'] != "") { $natent['def_sip_proxy_ip'] = $_POST['def_sip_proxy_ip']; }else{ $natent['def_sip_proxy_ip'] = ""; }
if ($_POST['def_sip_proxy_ports'] != "") { $natent['def_sip_proxy_ports'] = $_POST['def_sip_proxy_ports']; }else{ $natent['def_sip_proxy_ports'] = ""; }
- if ($_POST['def_sip_ip'] != "") { $natent['def_sip_ip'] = $_POST['def_sip_ip']; }else{ $natent['def_sip_ip'] = ""; }
+ if ($_POST['def_sip_servers'] != "") { $natent['def_sip_servers'] = $_POST['def_sip_servers']; }else{ $natent['def_sip_servers'] = ""; }
if ($_POST['def_sip_ports'] != "") { $natent['def_sip_ports'] = $_POST['def_sip_ports']; }else{ $natent['def_sip_ports'] = ""; }
if ($_POST['def_auth_ports'] != "") { $natent['def_auth_ports'] = $_POST['def_auth_ports']; }else{ $natent['def_auth_ports'] = ""; }
if ($_POST['def_finger_ports'] != "") { $natent['def_finger_ports'] = $_POST['def_finger_ports']; }else{ $natent['def_finger_ports'] = ""; }
@@ -449,9 +449,9 @@ echo "{$snort_general_css}\n";
</tr>
<tr>
<td width="22%" valign="top" class="vncell2">Define SIP_SERVERS</td>
- <td width="78%" class="vtable"><input name="def_sip_ip"
- type="text" class="formfld" id="def_sip_ip" size="40"
- value="<?=htmlspecialchars($pconfig['def_sip_ip']);?>"> <br>
+ <td width="78%" class="vtable"><input name="def_sip_servers"
+ type="text" class="formfld" id="def_sip_servers" size="40"
+ value="<?=htmlspecialchars($pconfig['def_sip_servers']);?>"> <br>
<span class="vexpl">Example: "192.168.1.3/24,192.168.1.4/24". Leave
blank to scan all networks.</span></td>
</tr>
diff --git a/config/snort/snort_interfaces_edit.php b/config/snort/snort_interfaces_edit.php
index a0e912cd..3b4ae8b4 100644
--- a/config/snort/snort_interfaces_edit.php
+++ b/config/snort/snort_interfaces_edit.php
@@ -111,7 +111,7 @@ if (isset($id) && $a_nat[$id]) {
$pconfig['def_imap_servers'] = $a_nat[$id]['def_imap_servers'];
$pconfig['def_imap_ports'] = $a_nat[$id]['def_imap_ports'];
$pconfig['def_sip_proxy_ip'] = $a_nat[$id]['def_sip_proxy_ip'];
- $pconfig['def_sip_servers_ip'] = $a_nat[$id]['def_sip_servers_ip'];
+ $pconfig['def_sip_servers'] = $a_nat[$id]['def_sip_servers'];
$pconfig['def_sip_ports'] = $a_nat[$id]['def_sip_ports'];
$pconfig['def_sip_proxy_ports'] = $a_nat[$id]['def_sip_proxy_ports'];
$pconfig['def_auth_ports'] = $a_nat[$id]['def_auth_ports'];
@@ -255,7 +255,7 @@ if (isset($_GET['dup']))
if ($pconfig['def_imap_servers'] != "") { $natent['def_imap_servers'] = $pconfig['def_imap_servers']; }
if ($pconfig['def_imap_ports'] != "") { $natent['def_imap_ports'] = $pconfig['def_imap_ports']; }
if ($pconfig['def_sip_proxy_ip'] != "") { $natent['def_sip_proxy_ip'] = $pconfig['def_sip_proxy_ip']; }
- if ($pconfig['def_sip_ip'] != "") { $natent['def_sip_ip'] = $pconfig['def_sip_ip']; }else{ $natent['def_sip_ip'] = ""; }
+ if ($pconfig['def_sip_servers'] != "") { $natent['def_sip_servers'] = $pconfig['def_sip_servers']; }else{ $natent['def_sip_servers'] = ""; }
if ($pconfig['def_sip_ports'] != "") { $natent['def_sip_ports'] = $pconfig['def_sip_ports']; }else{ $natent['def_sip_ports'] = ""; }
if ($pconfig['def_sip_proxy_ports'] != "") { $natent['def_sip_proxy_ports'] = $pconfig['def_sip_proxy_ports']; }
if ($pconfig['def_auth_ports'] != "") { $natent['def_auth_ports'] = $pconfig['def_auth_ports']; }
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index d43a25e0..31aad164 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -317,7 +317,7 @@
<build_port_path>/usr/ports/security/snort</build_port_path>
<build_options>WITH_THREADS=yes WITH_IPV6=true WITH_MPLS=true WITH_GRE=true WITHOUT_TARGETBASED=true WITH_DECODERPRE=true WITH_ZLIB=true WITH_NORMALIZER=true WITH_REACT=true WITH_PERFPROFILE=true WITH_FLEXRESP3=true WITHOUT_MYSQL=true WITHOUT_ODBC=true WITHOUT_POSTGRESQL=true WITHOUT_PRELUDE=true WITH_SNORTSAM=true WITHOUT_PFSENSE=true</build_options>
<config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
- <version>2.9.1 pkg v. 2.0.1</version>
+ <version>2.9.1 pkg v. 2.0.2</version>
<required_version>2.0</required_version>
<status>Stable</status>
<configurationfile>/snort.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 3732ad59..637cd1bf 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -392,7 +392,7 @@
<build_port_path>/usr/ports/security/snort</build_port_path>
<build_options>WITH_THREADS=yes WITH_IPV6=true WITH_MPLS=true WITH_GRE=true WITHOUT_TARGETBASED=true WITH_DECODERPRE=true WITH_ZLIB=true WITH_NORMALIZER=true WITH_REACT=true WITH_PERFPROFILE=true WITH_FLEXRESP3=true WITHOUT_MYSQL=true WITHOUT_ODBC=true WITHOUT_POSTGRESQL=true WITHOUT_PRELUDE=true WITH_SNORTSAM=true WITHOUT_PFSENSE=true</build_options>
<config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
- <version>2.9.1 pkg v. 2.0.1</version>
+ <version>2.9.1 pkg v. 2.0.2</version>
<required_version>2.0</required_version>
<status>Stable</status>
<configurationfile>/snort.xml</configurationfile>