diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-09-26 22:46:40 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-09-26 22:46:40 +0000 |
| commit | 53916f5870fa1a018ca87893d66fd636f7926455 (patch) | |
| tree | 539565f85b3674c5675f7358165274d424ce929c | |
| parent | 2af80ca7c76cfedee89a7a996d1bc0d3f6f3d2f7 (diff) | |
| download | pfsense-packages-53916f5870fa1a018ca87893d66fd636f7926455.tar.gz pfsense-packages-53916f5870fa1a018ca87893d66fd636f7926455.tar.bz2 pfsense-packages-53916f5870fa1a018ca87893d66fd636f7926455.zip | |
Take into account pppoe interfaces
| -rw-r--r-- | packages/snort/snort.inc | 5 | ||||
| -rw-r--r-- | packages/snort/snort_rulesets.php | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/packages/snort/snort.inc b/packages/snort/snort.inc index f8060f95..768078c0 100644 --- a/packages/snort/snort.inc +++ b/packages/snort/snort.inc @@ -51,6 +51,8 @@ function sync_package_snort() { $iflist['opt' . $i] = "opt{$i}"; foreach($_POST['iface_array'] as $iface) { $if = convert_friendly_interface_to_real_interface_name($iface); + if($config['interfaces'][$iface]['ipaddr'] == "pppoe") + $if = "ng0"; if($if) { $ifaces_final .= " -i " . $if; $first = 1; @@ -100,6 +102,9 @@ function generate_snort_conf() { /* XXX: make multi wan friendly */ $snort_ext_int = $config['installedpackages']['snort']['config'][0]['iface_array'][0]; + if($config['interfaces'][$snort_ext_int]['ipaddr'] == "pppoe") + $snort_ext_int = "ng0"; + /* set the snort performance model */ if($config['installedpackages']['snort']['config'][0]['performance']) $snort_performance = $config['installedpackages']['snort']['config'][0]['performance']; diff --git a/packages/snort/snort_rulesets.php b/packages/snort/snort_rulesets.php index ff0afe9c..a0c894ce 100644 --- a/packages/snort/snort_rulesets.php +++ b/packages/snort/snort_rulesets.php @@ -111,7 +111,7 @@ include("head.inc"); echo " <input type='checkbox' name='toenable[]' value='$file' {$CHECKED} />"; echo "</td>"; echo "<td>"; - echo "<a target='_new' href='edit.php?submit=Load&savetopath=" . urlencode($file) . "'>{$file}</a>"; + echo "<a target='_new' href='edit.php?submit=Load&savetopath=" . urlencode("/usr/local/etc/snort/rules/") . urlencode($file) . "'>{$file}</a>"; echo "</td>"; //echo "<td>"; //echo "description"; |