Show
Ignore:
Timestamp:
01/10/07 14:06:43 (2 years ago)
Author:
kindlund
Message:

Merged trunk changes back into exp branch, in order to prepare for final merge back into trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeyclient/branches/exp/stephenson-link_scoring

    • Property sc:bug-fix-release-branch set to 0.9

  • honeyclient/branches/exp/stephenson-link_scoring/bin/StartAgent.pl

    • Property svn:keywords set to Id "$file"
    r13 r153  
    1 #!perl -w 
     1#!perl -w -Ilib 
     2 
     3# $Id$ 
    24 
    35use strict; 
    …… 
    3537    print "Watchdog fault detected, recovering Agent daemon.\n"; 
    3638    # XXX: Reenable this, eventually. 
    37 #    Carp::carp __PACKAGE__ . "->_watchdogFaultHandler(): Error occurred during processing.\n" . $errMsg; 
     39    #Carp::carp __PACKAGE__ . "->_watchdogFaultHandler(): Error occurred during processing.\n" . $errMsg; 
    3840 
    3941 

  • honeyclient/branches/exp/stephenson-link_scoring/bin/StartManager.pl

    • Property svn:keywords set to Id "$file"
    r151 r153  
    1 #!/usr/bin/perl -w 
     1#!perl -w -Ilib 
     2 
     3# $Id$ 
    24 
    35use strict; 
    …… 
    2022my $agentState = HoneyClient::Manager->run( 
    2123                    driver           => 'IE', # Change to 'IE' or 'FF' 
    22                     master_vm_config => '/vm/Agent.Master-4/winXPPro.cfg', 
     24                    master_vm_config => '/vm/Agent.Master-7/winXPPro.cfg', 
    2325                    agent_state      => encode_base64(nfreeze({ 
    2426                        IE => { # Change to 'IE' or 'FF'