From patchwork Fri Apr 26 03:31:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 2214 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 0824285BD81 for ; Thu, 25 Apr 2019 18:32:00 +0100 (BST) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 44qkl33ffCz5GpB6; Thu, 25 Apr 2019 18:31:59 +0100 (BST) Received: from tuxedo.stevee (212095005098.public.telering.at [212.95.5.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 44qkkw5P6yz5161R; Thu, 25 Apr 2019 18:31:52 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904rsa; t=1556213512; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:openpgp:autocrypt; bh=a7f9J0Yr5azzEms6XaWVZFNzFNnudeaJN+XmdUHpaLw=; b=a3AAAASdrvbF6LkSP/sVKZ15cCyi5v3qr+IufaRXoE8oJD9RYP5bpru4LRCIBOdhQ1Lib8 F0ZhPApH3ufP2mv+FTHJm8G2UHqJ+txcn5hU3cKOgmkjY5ivA3FJliKzHN6pzB9SmRSKbF Z66w06BN0dMFQ98xFMWPeU5VHrEPRXpPzQJtwbQLw8DArOyME3Da/8/GGej2dc+3nqD07d IB9fuqGct4hFYaLhDZeaAklr/4roIHvimV90nUMVfAcWL+48r81WxDbzIdxAtsaROcZZCS TRTa43k4jPxH+786jl/r1zIRtRYi7myFNxVAouKe5fFStZcU1hidPzspPvgWEQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201904ed25519; t=1556213512; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:openpgp:autocrypt; bh=a7f9J0Yr5azzEms6XaWVZFNzFNnudeaJN+XmdUHpaLw=; b=Wp/Oo8qCbp6HAA/hZEGPWYvlVTJSWZWjIB8OWRyO5VAcb4vLdDNID01Qsg6dpBEniCheIZ hgE3TB6Mv6xTY5Aw== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/3] initscripts/suricata: Move functions order and always use flush_fw_chain function Date: Thu, 25 Apr 2019 19:31:47 +0200 Message-Id: <20190425173148.3868-2-stefan.schantl@ipfire.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190425173148.3868-1-stefan.schantl@ipfire.org> References: <20190425173148.3868-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=stevee smtp.mailfrom=stefan.schantl@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Stefan Schantl --- src/initscripts/system/suricata | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata index ecd693054..233cded53 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -48,12 +48,18 @@ function get_cpu_count { echo $CPUCOUNT } +# Function to flush the firewall chain. +function flush_fw_chain { + # Call iptables and flush the chain + iptables -F "$FW_CHAIN" +} + # Function to create the firewall rules to pass the traffic to suricata. function generate_fw_rules { cpu_count=$(get_cpu_count) # Flush the firewall chain. - iptables -F "$FW_CHAIN" + flush_fw_chain # Loop through the array of network zones. for zone in "${network_zones[@]}"; do @@ -103,12 +109,6 @@ function generate_fw_rules { iptables -A "${FW_CHAIN}" -j MARK --set-xmark "0x0/${MASK}" } -# Function to flush the firewall chain. -function flush_fw_chain { - # Call iptables and flush the chain - iptables -F "$FW_CHAIN" -} - case "$1" in start) # Get amount of CPU cores.