From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 4/5] convert-ids-modifysids-file: Adjust code to use changed
 write_modify_sids_file function
Date: Wed, 05 Jun 2019 20:56:35 +0200
Message-ID: <20190605185636.9952-4-stefan.schantl@ipfire.org>
In-Reply-To: <20190605185636.9952-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0017940333447342351=="
List-Id: <development.lists.ipfire.org>

--===============0017940333447342351==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
---
 config/suricata/convert-ids-modifysids-file | 32 +++------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/config/suricata/convert-ids-modifysids-file b/config/suricata/co=
nvert-ids-modifysids-file
index 8b70aa0fc..adcc10577 100644
--- a/config/suricata/convert-ids-modifysids-file
+++ b/config/suricata/convert-ids-modifysids-file
@@ -24,44 +24,20 @@ use strict;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/ids-functions.pl";
=20
-# Hash which contains the IDS (suricata) settings.
-my %idssettings;
-
-# Hash which contains the RULES settings.
-my %rulessettings;
-
-#
-## Step 1: Read IDS and rules settings.
-#
-
 exit unless(-f $IDS::ids_settings_file and -f $IDS::rules_settings_file);
=20
-# Read IDS settings.
-&General::readhash("$IDS::ids_settings_file", \%idssettings);
-
-# Read rules settings.
-&General::readhash("$IDS::rules_settings_file", \%rulessettings);
-
 #
-## Step 2: Generate and write the file to modify the ruleset.
+## Step 1: Re-generate and write the file to modify the ruleset.
 #
=20
-my $IDS_action =3D "drop";
-
-# Check if the traffic only should be monitored.
-if ($idssettings{"MONITOR_TRAFFIC_ONLY"} eq "on") {
-	# Switch IDS action to alert only.
-	$IDS_action =3D "alert";
-}
-
 # Call subfunction and pass the desired IDS action.
-&IDS::write_modify_sids_file($IDS_action, $rulessettings{RULES});
+&IDS::write_modify_sids_file();
=20
 # Set correct ownership.
 &IDS::set_ownership("$IDS::modify_sids_file");
=20
 #
-## Step 3: Call oinkmaster to extract and setup the rules structures.
+## Step 2: Call oinkmaster to extract and setup the rules structures.
 #
=20
 # Check if a rulestarball is present.
@@ -74,7 +50,7 @@ if (-f $IDS::rulestarball) {
 }
=20
 #
-## Step 4: Start the IDS if enabled.
+## Step 3: Reload the IDS ruleset if running.
 #
=20
 # Check if the IDS should be started.
--=20
2.20.1


--===============0017940333447342351==--