Changeset 769

Timestamp:

07/26/07 14:44:38 (1 year ago)

Author:

kindlund

Message:

Enabled 'master_vm_config' configuration option.

Files:

• honeyclient/trunk/bin/StartManager.pl (modified) (2 diffs)
• honeyclient/trunk/lib/HoneyClient/Manager.pm (modified) (1 diff)

honeyclient/trunk/bin/StartManager.pl

@@ -27 +27 @@
-#           'HoneyClient::Agent::Driver::Browser::FF'
-my $driver = "HoneyClient::Agent::Driver::Browser::IE";
-"/vm/master-vms/Agent.Master-23/winXPPro.cfg"
-10
+undef
+-1
-my $nexturl = "";
-my $urllist= "";
@@ -67 +67 @@
-                        $driver => {
-                            next_link_to_visit => $firsturl,
-                            # Enable this line, if you want to only go to the
-                            # first 5 links for each domain.
-                            max_relative_links_to_visit => $maxrel,
-                            links_to_visit => \%remaining_urls,

honeyclient/trunk/lib/HoneyClient/Manager.pm

@@ -463 +463 @@
-    my ($class, %args) = @_;
-    my $agentState = undef;
+
+    # Sanity check, make sure the master_vm_config has
+    # been specified.
+    my $argsExist = scalar(%args);
+    if (!$argsExist ||
+        !exists($args{'master_vm_config'}) ||
+        !defined($args{'master_vm_config'})) {
+        # Get the master_vm_config from the configuration file.
+        $args{'master_vm_config'} = getVar(name      => "master_vm_config",
+                                           namespace => "HoneyClient::Manager::VM");
+    }
-
-    for (;;) {