From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCHv2] firewalllog.dat: Proper display protocol names.
Date: Thu, 15 Jul 2021 16:46:27 +0100
Message-ID: <C43573EC-B27A-44D7-8379-9C661808BB39@ipfire.org>
In-Reply-To: <20210715081618.2279-1-stefan.schantl@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4149212422125418541=="
List-Id: <development.lists.ipfire.org>

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

You can copy the Git tags you have already collected into the new patch :)

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 15 Jul 2021, at 09:16, Stefan Schantl <stefan.schantl(a)ipfire.org> wrot=
e:
>=20
> In some cases iptables logs the protocol number instead of the name.
> When accessing the logs via the WUI, this number has been displayed as used
> protocol, which is very hard to read and understand.
>=20
> This commit adds a new function to the general-functions.pl, which
> generates a hash to translate the protocol number into the protocol
> name.
>=20
> Fixes #11282.
>=20
> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
> ---
> config/cfgroot/general-functions.pl   | 36 +++++++++++++++++++++++++++
> html/cgi-bin/logs.cgi/firewalllog.dat |  8 ++++++
> 2 files changed, 44 insertions(+)
>=20
> diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-f=
unctions.pl
> index 550afcf82..1da1218ab 100644
> --- a/config/cfgroot/general-functions.pl
> +++ b/config/cfgroot/general-functions.pl
> @@ -1363,6 +1363,42 @@ sub formatBytes {
> 	return sprintf("%.2f %s", $bytes, $unit);
> }
>=20
> +# Function to collect and generate a hash for translating protocol numbers=
 into
> +# their names.
> +sub generateProtoTransHash () {
> +	# File which contains the protocol definitions.
> +	my $protocols_file =3D "/etc/protocols";
> +
> +	my %protocols =3D ();
> +
> +	# Open protocols file.
> +	open(FILE, "$protocols_file") or die "Could not open $protocols_file. $!\=
n";
> +
> +	# Loop through the file.
> +	while (my $line =3D <FILE>) {
> +		# Skip comments.
> +		next if ($line =3D~ /^\#/);
> +
> +		# Skip blank  lines.
> +		next if ($line =3D~ /^\s*$/);
> +
> +		# Remove any newlines.
> +		chomp($line);
> +
> +		# Split line content.
> +		my ($protocol_lc, $number, $protocol_uc, $comment) =3D split(' ', $line);
> +
> +		# Add proto details to the hash of protocols.
> +		$protocols{$number} =3D $protocol_uc;
> +	}
> +
> +	# Close file handle.
> +	close(FILE);
> +
> +	# Return the hash.
> +	return %protocols;
> +}
> +
> # Cloud Stuff
>=20
> sub running_in_cloud() {
> diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/=
firewalllog.dat
> index e326d65c0..73596d8cd 100644
> --- a/html/cgi-bin/logs.cgi/firewalllog.dat
> +++ b/html/cgi-bin/logs.cgi/firewalllog.dat
> @@ -325,6 +325,8 @@ print <<END
> END
> ;
>=20
> +# Generate hash to translate protocol numbers into protocol names.
> +my %protocols =3D &General::generateProtoTransHash();
>=20
> $lines =3D 0;
> foreach $_ (@log)
> @@ -354,6 +356,12 @@ foreach $_ (@log)
> 	# Get the country code.
> 	my $ccode =3D &Location::Functions::lookup_country_code($srcaddr);
>=20
> +	# Lookup if the grabbed protocol is part of the protocols hash.
> +	if (exists ($protocols{$proto})) {
> +		# Translate protocol number into protocol name.
> +		$proto =3D $protocols{$proto};
> +	}
> +
> 	my $servi =3D uc(getservbyport($srcport, lc($proto)));
> 	if ($servi ne '' && $srcport < 1024) {
> 		$srcport =3D "$srcport($servi)";=20
> --=20
> 2.30.2
>=20


--===============4149212422125418541==--