Introduce SortAddressHash function.

[people/stevee/guardian.git] / modules / Base.pm

diff --git a/modules/Base.pm b/modules/Base.pm
index f29f5432c67616ee624eaf7daa0bf9f81eb2d076..41ac981f9eb41786fba4430392cef8eac851a4f1 100644 (file)
--- a/modules/Base.pm
+++ b/modules/Base.pm
@@ -4,7 +4,7 @@ use warnings;
 
 use Exporter qw(import);
 
-our @EXPORT_OK = qw(GenerateMonitoredFiles DetectIPProtocolVersion FilePositions);
+our @EXPORT_OK = qw(GenerateMonitoredFiles GetFileposition DetectIPProtocolVersion FilePositions);
 
 use Net::IP;
 
@@ -107,7 +107,7 @@ sub FilePositions (\%\%) {
                        $new_file_positions{$file} = $current_file_positions{$file};
                } else {
                        # Call function to obtain the file position.
-                       my $position = &_initFileposition($file);
+                       my $position = &GetFileposition($file);
 
                        # Add filename and position to the temporary hash.
                        $new_file_positions{$file} = $position;
@@ -189,7 +189,7 @@ sub DetectIPProtocolVersion ($) {
 }
 
 #
-## Function for fileposition initialization.
+## Function to get the current (EOF) cursor postion.
 #
 ## This function is used to get the cursor position of the end of file (EOF) of
 ## a specified file.
@@ -198,7 +198,7 @@ sub DetectIPProtocolVersion ($) {
 ## with huge logfiles, at initialization time of the worker processes, the file will
 ## be opened once and the cursor position of the end of file (EOF) get stored.
 #
-sub _initFileposition ($) {
+sub GetFileposition ($) {
        my $file = $_[0];
 
        # Open the file.
@@ -217,4 +217,34 @@ sub _initFileposition ($) {
        return $position;
 }
 
+#
+## The SortAddressHash function.
+#
+# This function requires a reference to an hash containing
+# IP-addresses, will sort them into a nice looking order
+# and return the soreted result as an array.
+#
+sub SortAddressHash (\%) {
+       # Dereference the given hash reference and store it
+       # in a new temporary hash.
+       my %addresshash = %{ $_[0] };
+
+       # Loop through the entire hash keys.
+       foreach my $address (keys(%addresshash)) {
+               # Convert the address or subnet into binary format.
+               my @bin_address = &IPOrNet2Int($address);
+
+               # Only store the first result if there are multiple
+               # one in case of a given subnet.
+               $addresshash{$address} = $bin_address[0];
+        }
+
+       # Sort the addresshash by the binary addresses
+        # of the stored addresses and save them is an array.
+        my @sorted_addresses = sort { $addresshash{$a} <=> $addresshash{$b} } keys %addresshash;
+
+        # Return the sorted address array.
+        return @sorted_addresses;
+}
+
 1;