From 93b31c59eaa2dbde1720fa85ee42c53b46db2cab Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Sat, 30 Aug 2014 12:22:42 -0400
Subject: Suricata prefers CIDR masks on HOME_NET and EXTERNAL_NET addresses.

---
 config/suricata/suricata_list_view.php | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'config/suricata/suricata_list_view.php')

diff --git a/config/suricata/suricata_list_view.php b/config/suricata/suricata_list_view.php
index dc5a2b04..ec335abd 100644
--- a/config/suricata/suricata_list_view.php
+++ b/config/suricata/suricata_list_view.php
@@ -42,7 +42,7 @@ $type = htmlspecialchars($_GET['type']);
 $title = "List";
 
 if (isset($id) && isset($wlist)) {
-	$a_rule = $config['installedpackages']['suricataglobal']['rule'][$id];
+	$a_rule = $config['installedpackages']['suricata']['rule'][$id];
 	if ($type == "homenet") {
 		$list = suricata_build_list($a_rule, $wlist);
 		$contents = implode("\n", $list);
@@ -59,8 +59,17 @@ if (isset($id) && isset($wlist)) {
 		$title = "Suppress List";
 	}
 	elseif ($type == "externalnet") {
-		$list = suricata_build_list($a_rule, $wlist, false, true);
-		$contents = implode("\n", $list);
+		if ($wlist == "default") {
+			$list = suricata_build_list($a_rule, $a_rule['homelistname']);
+			$contents = "";
+			foreach ($list as $ip)
+				$contents .= "!{$ip}\n";
+			$contents = trim($contents, "\n");
+		}
+		else {
+			$list = suricata_build_list($a_rule, $wlist, false, true);
+			$contents = implode("\n", $list);
+		}
 		$title = "EXTERNAL_NET";
 	}
 	else
-- 
cgit v1.2.3