Changeset 118

Timestamp:

12/16/06 23:43:37 (2 years ago)

Author:

kindlund

Message:

Completed draft version of code; everything appears to work… still need to rigorously test it and cleanup debug logic, along with documentation and unit testing.

Files:

• honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry.pm (modified) (7 diffs)
• honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Makefile (modified) (1 diff)
• honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Parser.pm (modified) (1 diff)
• honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Parser.yp (modified) (1 diff)

honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry.pm

@@ -132 +132 @@
-use Filesys::CygwinPaths qw(:all);
-
+# Use Binary Search Library.
+use Search::Binary;
+
-#######################################################################
-# Module Initialization                                               #
@@ -251 +254 @@
-use Filesys::CygwinPaths qw(:all);
-
+# Make sure Search::Binary loads
+BEGIN { use_ok('Search::Binary')
+        or diag("Can't load Search::Binary package. Check to make sure the package library is correctly listed within the path."); }
+require_ok('Search::Binary');
+can_ok('Search::Binary', 'binary_search');
+use Search::Binary;
+
-# Make sure HoneyClient::Agent::Integrity::Registry::Parser loads
-BEGIN { use_ok('HoneyClient::Agent::Integrity::Registry::Parser')
@@ -347 +357 @@
-    # is the file parser, and the hash value is the entry counter.
-    _currentEntryIndex => { },
+
+    # A helper variable, used to keep track of the last search index,
+    # used by the _search() function. 
+    _last_search_index => undef,
+
+    # A helper variable, used to set the array of known line numbers,
+    # where each array entry is a line number, which separates a different
+    # group block.    
+    _group_index_linenums => [ ],
-);
-
@@ -617 +636 @@
-        Carp::croak("Error: Unable to unlink temporary file '" . $tmpfile ."'.");
-    }
+}
+
+# Helper function, designed to be called from within the
+# Search::Binary::binary_search() function, in order to allow
+# the binary_search to properly read in group line number data from
+# the default array reference.
+#
+# For more information about how this function operates, please
+# see the Search::Binary POD documentation.
+#
+# Inputs: arrayref, value_to_compare, current_array_index
+# Outputs: comparison, last_valid_array_index
+sub _search {
+    # Extract arguments.
+    my ($self, $value_to_compare, $current_array_index) = @_;
+
+    # Increment the search index, if the current one is undef.
+    if (defined($current_array_index)) {
+        $self->{'_last_search_index'} = $current_array_index;
+    } else {
+        $self->{'_last_search_index'}++;
+    }
+
+    # Perform a comparison, if the array entry is defined.
+    if (defined(@{$self->{'_group_index_linenums'}}[$self->{'_last_search_index'}])) {
+        return($value_to_compare <=> @{$self->{'_group_index_linenums'}}[$self->{'_last_search_index'}],
+               $self->{'_last_search_index'});
+    }
+
+    # Array entry not found, return undef with this position.
+    return (undef, $self->{'_last_search_index'});
-}
-
@@ -747 +797 @@
-            $after_total_linenums += $after_parser->getCurrentLineCount();
-
+$self->{'_group_index_linenums'} = $before_linenums;
+my $found_index = binary_search(0, scalar(@{$before_linenums}) - 1, $before_total_linenums, \&_search, $self);
+
+# Find the group before corresponding the matched line number.
+if ($found_index > 0) {
+    $found_index--;
+}
+
+print("FOUND INDEX: " . Dumper($found_index) . "\n");
+print("FOUND B_LINENO: " . Dumper(@{$before_linenums}[$found_index]) . "\n");
+print("FOUND TYPE: " . Dumper(@{$diff_types}[$found_index]) . "\n");
+$diff_type = @{$diff_types}[$found_index];
+
-print("Before Current Linenums: ", Dumper($before_total_linenums) . "\n");
-print("After Current Linenums: ", Dumper($after_total_linenums) . "\n");
@@ -880 +943 @@
-                # Else, if the after group doesn't exist, or if the before group exists and the
-                # before group name is alphabetically earlier than the after group name...
-
+or change 
-                # may not be sorted alphabetically).
-            } elsif (!defined($after_group) || defined($before_group) &&
-$diff_type eq 'd'
+($diff_type eq 'd') || ($diff_type eq 'c')
-                      ($self->_cmpGroup($before_group, $after_group) < 0))) {
-
@@ -964 +1027 @@
-                $changeState--;
-            }
-# TODO: delete.
-#$Data::Dumper::Terse = 1;
-#$Data::Dumper::Indent = 1;
-#print "Current Change: " . Dumper($currentChange) . "\n";
-        }
-
-    }
-
-    # TODO: delete.
-    #return $changes;
-}
-

honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Makefile

@@ -2 +2 @@
-
-Parser:
+    chmod 644 Makefile
+    chmod 644 Parser.yp
-    yapp -m HoneyClient::Agent::Integrity::Registry::Parser Parser.yp
-

honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Parser.pm

@@ -687 +687 @@
-# Search::Binary::binary_search() function, in order to allow
-# the binary_search to properly read in group index data from
-array
+parser
-#
-# For more information about how this function operates, please

honeyclient/branches/bug/42/lib/HoneyClient/Agent/Integrity/Registry/Parser.yp

@@ -532 +532 @@
-# Search::Binary::binary_search() function, in order to allow
-# the binary_search to properly read in group index data from
-array
+parser
-#
-# For more information about how this function operates, please