Changeset 1088

Timestamp:

12/30/07 16:30:01 (11 months ago)

Author:

xkovah

Message:

well, it's running at this point…now to try out putting something in the text file

Files:

• honeyclient/branches/exp/xkovah-priority_interrupt/lib/HoneyClient/Agent/Driver/Browser.pm (modified) (1 diff)
• honeyclient/branches/exp/xkovah-priority_interrupt/lib/HoneyClient/Manager.pm (modified) (6 diffs)

honeyclient/branches/exp/xkovah-priority_interrupt/lib/HoneyClient/Agent/Driver/Browser.pm

@@ -477 +477 @@
-
-        # If the next link scalar is empty, try
+        # getting a link from the priority_links
+        unless (defined($link)) {
+            $link = _pop($self->priority_links);
+        }
+
+        # If the priority_links hashtable is empty, try
-        # getting a link from the relative hashtable.
-        unless (defined($link)) {

honeyclient/branches/exp/xkovah-priority_interrupt/lib/HoneyClient/Manager.pm

@@ -139 +139 @@
-our $globalAgentStateInWaiting   = undef;
-
-#our $priority_links_to_visit = 0;
-#our %priority_links = ();
-#FIXME: This should by putting the links into the agent driver state
-#Global error count for determining when to stop trying to contact the agent
-our $G_error_count = 0;
@@ -377 +374 @@
-
-    print "I am the ALPHA\n";
-$args{'agent_state'}
+thaw(decode_base64($args{'agent_state'}))
-
-    for (;;) {
-        print "Starting new session...\n";
-        $agentState = $class->runSession(%args);
+        if(defined($globalAgentStateInWaiting)){
+
+        }
-        $args{'agent_state'} = $agentState;
-        # XXX: Delete this, eventually.
@@ -440 +440 @@
-    print "Calling updateState()...\n";
-    print "YOU MUST BE AT LEAST THIS COMPLETE TO RIDE THE UPDATESTATE\n";
-$args{'agent_state'}
+thaw(decode_base64($args{'agent_state'}))
-    $som = $stubAgent->updateState($args{'agent_state'});
-
@@ -479 +479 @@
-            #At this point, the driver could still be running, but we want to interrupt as soon
-            #as possible even though we may lose a little state.
-priority_links) > 0 && !$priority_links_to_visit
+{$ret->{$args{'driver'}}->{'state'}->{priority_links}}) > 0
-                #The agent is still running, and is not compromised, but there are priority links
-                #to process. This means we need to save off the state of the running VM, and  
@@ -580 +580 @@
-            return $args{'agent_state'};
-        }
-priority_links
+{$ret->{$args{'driver'}}->{'state'}->{priority_links}}
-            %vmStateTable = ( );
-            #In this case, we want to suspend the VM and we need to build a 
-            #new agentState which has only the links from the %priority_links
-$args{agent_state}->links_to_visit = \%priority_links
-
+print "GOT HERE\n"
+
- 
-        }
@@ -597 +597 @@
-sub _updatePriorityLinks {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            my $tmp = $_;
-            chomp($tmp);
-            $tmp =~ s/\r$//;
-
+->
-        }
-        close(PRIORITY);
-        system("rm $priority_links_file"); #FIXME: make more generic
+        }
+        $driverRef->{'status'}->{'priority_links_remaining'} = $num_keys;
-    }
-    my $num_keys = keys %{$priority_links};
-    $driverRef->{'status'}->{'priority_links_remaining'} = $num_keys;
- 
-    return $num_keys;