From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] suricata: Use device ppp0 if PPPoE dialin is used. Date: Wed, 24 Apr 2019 11:54:01 +0100 Message-ID: In-Reply-To: <20190423182614.4198-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3397226294134922092==" List-Id: --===============3397226294134922092== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Thanks. Merged. > On 23 Apr 2019, at 19:26, Stefan Schantl wrot= e: >=20 > Fixes #12058 >=20 > Signed-off-by: Stefan Schantl > --- > src/initscripts/system/suricata | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) >=20 > diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suric= ata > index 16548753e..b407afa3c 100644 > --- a/src/initscripts/system/suricata > +++ b/src/initscripts/system/suricata > @@ -18,6 +18,7 @@ > PATH=3D/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin; export= PATH >=20 > eval $(/usr/local/bin/readhash /var/ipfire/suricata/settings) > +eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) >=20 > # Name of the firewall chain. > FW_CHAIN=3D"IPS" > @@ -65,8 +66,16 @@ function generate_fw_rules { >=20 > # Check if the IDS is enabled for this network zone. > if [ "${!enable_ids_zone}" =3D=3D "on" ]; then > - # Generate name of the network interface. > - network_device=3D$zone > + # Check if the current processed zone is "red" and the configured type = is PPPoE dialin. > + if [ "$zone" =3D=3D "red" ] && [ "$RED_TYPE" =3D=3D "PPPOE" ]; then > + # Set device name to ppp. > + network_device=3D"ppp" > + else > + # The device name is identical with the zone name. > + network_device=3D$zone > + fi > + > + # Finish generation of the device name. > network_device+=3D"0" >=20 > # Assign NFQ_OPTS > --=20 > 2.20.1 >=20 --===============3397226294134922092==--