snort-dev, update snort.inc

3 files changed, 14 insertions, 23 deletions

diff --git a/config/snort-dev/NOTES.txt b/config/snort-dev/NOTES.txt
index 9b4d8d0e..b6c49926 100644
--- a/config/snort-dev/NOTES.txt
+++ b/config/snort-dev/NOTES.txt
@@ -18,28 +18,14 @@ Move the Snort GUI to base of Pfsense. The divert options should be added to fir
 
 Ask Ermal to add divert out to Pfsense again though, he has kept divert in.
 
-=====================
-What Im working on
-=====================
-
-snort.inc 
-Must be recoded so that it reads the [snortglobal] [snortglobal][rule] options in conf.xml and makes the files whitelist, snort.sh, snort.conf, and barnyard.conf.
-This is easy, just cut and paste from the old snort.inc. I will work on this.
-
-
 =================================
 Any Devs that would like to help please work on snort_rules_edit.php and snort_rules.php. They work but need cleaning up.
 =================================
 
 To get snort_rules_edit.php and snort_rules.php working 
 
-Add at least on rule to snort_interfaces.php.
-
-Add at least one snort rule file to /usr/local/etc/snort/snort_0vr1/rules/.
-Should look like this /usr/local/etc/snort/snort_0vr1/rules/attack-responses.rules.
-Note that "snort_0vr1" should be chaned to what interface option you added.
-
-http://www.emergingthreats.net/rules/emerging.rules.tar.gz
+ * Update the rules.
+ * Add at least on rule to snort_interfaces.php.
 
 snort_rules_edit.php 
 Make sure all snort sig options that are in the GUI are written to file.
@@ -49,14 +35,19 @@ Change the way the rules get disabled, by removing the x icon image and replacin
 This should improve the users experience. Moreover, check boxes could be added to blocked.php tab to improve performance.
 Users always complain that the way were deleting options is slow. 
 
-create whitelist.php and help_info.php
-
-
 ===========================================
 Misc.
 ===========================================
 
-Adding extry options to the new snort gui for snort_inline should be easy once we have it working.
+All further development will be in Freebsd 8. 
+
+ALL further snort and barnyard builds will be mmx sse.
+
+All further snort builds will have snort_inline code.
+
+All further builds will have "did I start on a pfsense system" code, if not, exit.
+
+Adding extra options to the new snort gui for snort_inline should be easy.
 
 Snort_inline binaries with custom c++ code ready to go.
 
diff --git a/config/snort-dev/snort.inc b/config/snort-dev/snort.inc
index 4e582d7a..5e49cad2 100644
--- a/config/snort-dev/snort.inc
+++ b/config/snort-dev/snort.inc
@@ -40,7 +40,7 @@ $id = $_GET['id'];
 if (isset($_POST['id']))
 	$id = $_POST['id'];
 
-$interface_fake = $config['installedpackages']['snortglobal']['rule'][$id][interface];
+$interface_fake = $config['installedpackages']['snortglobal']['rule'][$id]['interface'];
 $if_real = convert_friendly_interface_to_real_interface_name($interface_fake);
 
 /* Allow additional execution time 0 = no limit. */
@@ -131,7 +131,7 @@ foreach ($rule_array as $value) {
 
 $id += 1;
 
-$result_lan = $config['installedpackages']['snortglobal']['rule'][$id][interface];
+$result_lan = $config['installedpackages']['snortglobal']['rule'][$id]['interface'];
 $if_real = convert_friendly_interface_to_real_interface_name($result_lan);
 
 	/* create snort configuration file */
diff --git a/config/snort-dev/snort_download_rules.php b/config/snort-dev/snort_download_rules.php
index 688b89a7..d7b58c39 100644
--- a/config/snort-dev/snort_download_rules.php
+++ b/config/snort-dev/snort_download_rules.php
@@ -738,7 +738,7 @@ foreach ($rule_array as $value) {
 
 $id += 1;
 
-$result_lan = $config['installedpackages']['snortglobal']['rule'][$id][interface];
+$result_lan = $config['installedpackages']['snortglobal']['rule'][$id]['interface'];
 $if_real = convert_friendly_interface_to_real_interface_name($result_lan);
 
 	/* make oinkmaster.conf for each interface rule */