diff options
| author | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-13 15:26:20 -0400 |
|---|---|---|
| committer | bmeeks8 <bmeeks8@bellsouth.net> | 2014-09-13 15:26:20 -0400 |
| commit | e9423bf7fb424aad2474a07a01b5623859ba73ca (patch) | |
| tree | e496b63cf36f6513da9a65ce3f6629098799316d /config/snort/snort_generate_conf.php | |
| parent | 132ee0dc4278e6f5a521259d06c7572bf9258f3e (diff) | |
| download | pfsense-packages-e9423bf7fb424aad2474a07a01b5623859ba73ca.tar.gz pfsense-packages-e9423bf7fb424aad2474a07a01b5623859ba73ca.tar.bz2 pfsense-packages-e9423bf7fb424aad2474a07a01b5623859ba73ca.zip | |
Improve HOME_NET and EXTERNAL_NET generation and allow viewing of results.
Diffstat (limited to 'config/snort/snort_generate_conf.php')
| -rw-r--r-- | config/snort/snort_generate_conf.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/config/snort/snort_generate_conf.php b/config/snort/snort_generate_conf.php index a5cc08d0..e3b38301 100644 --- a/config/snort/snort_generate_conf.php +++ b/config/snort/snort_generate_conf.php @@ -41,11 +41,17 @@ /* Custom home nets */ $home_net_list = snort_build_list($snortcfg, $snortcfg['homelistname']); $home_net = implode(",", $home_net_list); - -$external_net = '!$HOME_NET'; +$home_net = trim($home_net); +$external_net = ""; if (!empty($snortcfg['externallistname']) && $snortcfg['externallistname'] != 'default') { - $external_net_list = snort_build_list($snortcfg, $snortcfg['externallistname']); + $external_net_list = snort_build_list($snortcfg, $snortcfg['externallistname'], false, true); $external_net = implode(",", $external_net_list); + $external_net = "[" . trim($external_net) . "]"; +} +else { + foreach ($home_net_list as $ip) + $external_net .= "!{$ip},"; + $external_net = trim($external_net, ', '); } /* User added custom configuration arguments */ |