Show
Ignore:
Timestamp:
03/24/09 18:03:08 (15 years ago)
Author:
bhilburn
Message:

Making ConnectToRemoteComponent? an engine function since the SML doesn't
need it, adding a bool representing presence of SML, updating
PolicyEngine? to reflect changes.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • vtcross/trunk/src/policy_engines/PolicyEngine.cpp

    r202 r203  
    4040    LOG("Creating Policy Engine.\n"); 
    4141 
    42     SML_present = SML; 
    43      
    44     ConnectToRemoteComponent(serverName, serverPort); 
     42    ConnectToRemoteComponent(serverName, serverPort, SML); 
    4543 
    4644    LoadPolicies(); 
    … …  
    5856void 
    5957PolicyEngine::ConnectToRemoteComponent(const char* serverName, \ 
    60         const char* serverPort) 
     58        const char* serverPort, const bool SML) 
    6159{ 
    6260    commandSocketFD = ClientSocket(serverName, serverPort); 
    6361 
    64     if(SML_present) { 
     62    SML_present = SML; 
     63 
     64    if(SML) { 
    6565        RegisterServices(); 
    6666        LOG("Policy Engine connected to SML at %s.\n", serverName); 
    … …  
    115115                close(commandSocketFD); 
    116116 
    117                 SML_present = true; 
    118  
    119                 ConnectToRemoteComponent(serverName, serverPort); 
     117                ConnectToRemoteComponent(serverName, serverPort, true); 
    120118            } 
    121119        } 
    … …  
    140138                close(commandSocketFD); 
    141139 
    142                 SML_present = false; 
    143  
    144                 ConnectToRemoteComponent(serverName, serverPort); 
     140                ConnectToRemoteComponent(serverName, serverPort, false); 
    145141            } 
    146142        } 
    … …  
    179175    else 
    180176        DeregisterComponent(); 
    181  
    182     SML_present = false; 
    183     commandSocketFD = -1; 
    184     LoadPolicies(); 
    185177} 
    186178 
    … …  
    202194    shutdown(commandSocketFD, 2); 
    203195    close(commandSocketFD); 
     196    commandSocketFD = -1; 
    204197    LOG("Policy Engine:: Shell socket closed.\n"); 
    205198} 
    … …  
    228221    shutdown(commandSocketFD, 2); 
    229222    close(commandSocketFD); 
     223    commandSocketFD = -1; 
    230224    LOG("Policy Engine:: SML socket closed.\n"); 
    231225}