webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

firewalllog.dat: Proper display protocol names.

Browse Source 
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.

This commit adds a new function to the general-functions.pl, which
generates a hash to translate the protocol number into the protocol
name.

Fixes #11282.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
Reviewed-by: Bernhard Bitsch <bbitsch@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Stefan Schantl
2021-07-15 10:16:18 +02:00
committed by Arne Fitzenreiter
parent 5c9faddc97
commit ca1f4a07ab
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
config/cfgroot/general-functions.pl
View File

@@ -1363,6 +1363,42 @@ sub formatBytes {
return sprintf("%.2f %s", $bytes, $unit);
}
# 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 = "/etc/protocols";
my %protocols = ();
# Open protocols file.
open(FILE, "$protocols_file") or die "Could not open $protocols_file. $!\n";
# Loop through the file.
while (my $line = <FILE>) {
# Skip comments.
next if ($line =~ /^\#/);
# Skip blank lines.
next if ($line =~ /^\s*$/);
# Remove any newlines.
chomp($line);
# Split line content.
my ($protocol_lc, $number, $protocol_uc, $comment) = split(' ', $line);
# Add proto details to the hash of protocols.
$protocols{$number} = $protocol_uc;
}
# Close file handle.
close(FILE);
# Return the hash.
return %protocols;
}
# Cloud Stuff
sub running_in_cloud() {

8
html/cgi-bin/logs.cgi/firewalllog.dat
View File

@@ -325,6 +325,8 @@ print <<END
END
;
# Generate hash to translate protocol numbers into protocol names.
my %protocols = &General::generateProtoTransHash();
$lines = 0;
foreach $_ (@log)
@@ -354,6 +356,12 @@ foreach $_ (@log)
# Get the country code.
my $ccode = &Location::Functions::lookup_country_code($srcaddr);
# Lookup if the grabbed protocol is part of the protocols hash.
if (exists ($protocols{$proto})) {
# Translate protocol number into protocol name.
$proto = $protocols{$proto};
}
my $servi = uc(getservbyport($srcport, lc($proto)));
if ($servi ne '' && $srcport < 1024) {
$srcport = "$srcport($servi)";