Changeset 382

Show
Ignore:
Timestamp:
05/25/07 19:15:53 (1 year ago)
Author:
kindlund
Message:

Updated manager code to reflect changes to Agent; also temporarily disabled firewall.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeyclient/branches/exp/kindlund-filesystem/lib/HoneyClient/Manager.pm

    r344 r382  
    610610   
    611611    # Initialize the firewall. 
    612     $stubFW->fwInit(); 
     612#    $stubFW->fwInit(); 
    613613 
    614614    # Add new chain, per cloned VM. 
    615     $stubFW->addChain($vmStateTable); 
     615#    $stubFW->addChain($vmStateTable); 
    616616    
    617617    sleep (2); 
    …… 
    643643            # Check to see if Agent::run() thread has stopped 
    644644            # and that a compromise was detected. 
    645             if (!defined($ret->{$args{'driver'}}->{thread_id})) { 
     645            if (!$ret->{$args{'driver'}}->{status}->{is_running}) { 
    646646                if ($ret->{$args{'driver'}}->{status}->{is_compromised}) { 
    647647                    print "Calling getState()...\n"; 
    …… 
    696696            # of firewall mods, or if the Agent is completely finished 
    697697            # and needs more input to continue. 
    698             if (!defined($ret->{$args{'driver'}}->{thread_id})) { 
     698            if (!$ret->{$args{'driver'}}->{status}->{is_running}) { 
    699699 
    700700 
    701701                # Delete the old firewall rules, based upon existing 
    702702                # targets. 
    703                 $stubFW->deleteRules($vmStateTable); 
     703#                $stubFW->deleteRules($vmStateTable); 
    704704 
    705705                # Get the new targets from the Agent. 
    …… 
    713713 
    714714                # Add the new targets from the Agent. 
    715                 $stubFW->addRules($vmStateTable); 
     715#                $stubFW->addRules($vmStateTable); 
    716716 
    717717                print "Calling run()...\n"; 
    …… 
    728728                    # the daemon, in which case, we indefinately try to reset the 
    729729                    # firewall accordingly. 
    730                     $stubFW->fwInit(); 
    731                     $stubFW->addChain($vmStateTable); 
    732                     $stubFW->addRules($vmStateTable); 
     730#                    $stubFW->fwInit(); 
     731#                    $stubFW->addChain($vmStateTable); 
     732#                    $stubFW->addRules($vmStateTable); 
    733733                }; 
    734734                if (!$@) { 
    …… 
    742742            return $args{'agent_state'}; 
    743743        } 
    744         print "Sleeping for 2 mins...\n"; 
    745         sleep (120); 
     744        print "Sleeping for 10s...\n"; 
     745        sleep (10); 
    746746    } 
    747747}