Changeset 312

Show
Ignore:
Timestamp:
05/04/07 23:42:55 (1 year ago)
Author:
kindlund
Message:

sc: merging branch using tags svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/tags/exp/UP1-kindlund-filesystem and svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • honeyclient/branches/exp/kindlund-filesystem/bin/StartAgent.pl

    r131 r312  
    4444    HoneyClient::Agent->destroy(); 
    4545 
     46    # Wait for a small amount of time, in order for the killed process to release 
     47    # its control of the bound TCP port. 
     48    sleep 5; 
     49 
    4650    $URL = HoneyClient::Agent->init(); 
    4751 
  • honeyclient/branches/exp/kindlund-filesystem/etc/honeyclient.xml

    r310 r312  
    4949    <!-- Note: This timeout should be long enough so that the Agent watchdog code will properly let the integrity checking code finish, before detecting a faulty timeout in processing. --> 
    5050    <timeout description="Default timeout used for all communications between each module (in seconds)." default="900"> 
    51         1800 
     51        3600 
    5252    </timeout> 
    5353    <log_config description="The global Log4perl configuration file, used throughout all modules.  This setting should not need to be changed." default="etc/honeyclient_log.conf"> 
  • honeyclient/branches/exp/kindlund-filesystem/lib/HoneyClient/Agent.pm

    r310 r312  
    469469    # the parent process... 
    470470    if (defined($DAEMON_PID) && ($DAEMON_PID != 0)) { 
     471        print STDERR "Killing PID = " . $DAEMON_PID . "\n"; 
    471472        # The Win32 version of kill() seems to only respond to SIGKILL(9). 
    472         $ret = kill(9, $DAEMON_PID); 
     473        # XXX: This doesn't work. 
     474        #$ret = kill(9, $DAEMON_PID); 
     475         
     476        # TODO: Need unit tests. 
     477        require Win32::Process; 
     478        Win32::Process::KillProcess($DAEMON_PID, 0); 
     479        $ret = 1; 
    473480    } 
    474481    if ($ret) {