(file) Return to Executor.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Executor.cpp between version 1.8 and 1.9

version 1.8, 2007/06/15 17:40:07 version 1.9, 2007/07/24 19:42:03
Line 551 
Line 551 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_PING_MESSAGE;         header.code = EXECUTOR_PING_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         ExecutorPingResponse response;         ExecutorPingResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         if (response.magic == EXECUTOR_PING_MAGIC)         if (response.magic == EXECUTOR_PING_MAGIC)
Line 579 
Line 579 
         if (mode != 'r' && mode != 'w' && mode != 'a')         if (mode != 'r' && mode != 'w' && mode != 'a')
             return NULL;             return NULL;
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_OPEN_FILE_MESSAGE;         header.code = EXECUTOR_OPEN_FILE_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return NULL;             return NULL;
  
         // _send request body.          // Send request body.
  
         ExecutorOpenFileRequest request;         ExecutorOpenFileRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);
         request.mode = mode;         request.mode = mode;
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return NULL;             return NULL;
  
         // Receive the response         // Receive the response
  
         ExecutorOpenFileResponse response;         ExecutorOpenFileResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return NULL;             return NULL;
  
         // Receive descriptor (if response successful).         // Receive descriptor (if response successful).
Line 633 
Line 633 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_RENAME_FILE_MESSAGE;         header.code = EXECUTOR_RENAME_FILE_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorRenameFileRequest request;         ExecutorRenameFileRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         Strlcpy(request.oldPath, oldPath, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.oldPath, oldPath, EXECUTOR_BUFFER_SIZE);
         Strlcpy(request.newPath, newPath, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.newPath, newPath, EXECUTOR_BUFFER_SIZE);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorRenameFileResponse response;         ExecutorRenameFileResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 666 
Line 666 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_REMOVE_FILE_MESSAGE;         header.code = EXECUTOR_REMOVE_FILE_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorRemoveFileRequest request;         ExecutorRemoveFileRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.path, path, EXECUTOR_BUFFER_SIZE);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorRemoveFileResponse response;         ExecutorRemoveFileResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 719 
Line 719 
         if (userNameLength >= EXECUTOR_BUFFER_SIZE)         if (userNameLength >= EXECUTOR_BUFFER_SIZE)
             return -1;             return -1;
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_START_PROVIDER_AGENT_MESSAGE;         header.code = EXECUTOR_START_PROVIDER_AGENT_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorStartProviderAgentRequest request;         ExecutorStartProviderAgentRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         memcpy(request.module, module, moduleNameLength);         memcpy(request.module, module, moduleNameLength);
         memcpy(request.userName, userNameCString, userNameLength);         memcpy(request.userName, userNameCString, userNameLength);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorStartProviderAgentResponse response;         ExecutorStartProviderAgentResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         // Check response status and pid.         // Check response status and pid.
Line 782 
Line 782 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_DAEMONIZE_EXECUTOR_MESSAGE;         header.code = EXECUTOR_DAEMONIZE_EXECUTOR_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorDaemonizeExecutorResponse response;         ExecutorDaemonizeExecutorResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 805 
Line 805 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_REAP_PROVIDER_AGENT_MESSAGE;         header.code = EXECUTOR_REAP_PROVIDER_AGENT_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body:          // Send request body:
  
         ExecutorReapProviderAgentRequest request;         ExecutorReapProviderAgentRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         request.pid = pid;         request.pid = pid;
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorReapProviderAgentResponse response;         ExecutorReapProviderAgentResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 838 
Line 838 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_AUTHENTICATE_PASSWORD_MESSAGE;         header.code = EXECUTOR_AUTHENTICATE_PASSWORD_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorAuthenticatePasswordRequest request;         ExecutorAuthenticatePasswordRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);
         Strlcpy(request.password, password, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.password, password, EXECUTOR_BUFFER_SIZE);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorAuthenticatePasswordResponse response;         ExecutorAuthenticatePasswordResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 871 
Line 871 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_VALIDATE_USER_MESSAGE;         header.code = EXECUTOR_VALIDATE_USER_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorValidateUserRequest request;         ExecutorValidateUserRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.username, username, EXECUTOR_BUFFER_SIZE);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorValidateUserResponse response;         ExecutorValidateUserResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 904 
Line 904 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_CHALLENGE_LOCAL_MESSAGE;         header.code = EXECUTOR_CHALLENGE_LOCAL_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorChallengeLocalRequest request;         ExecutorChallengeLocalRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         Strlcpy(request.user, username, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.user, username, EXECUTOR_BUFFER_SIZE);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorChallengeLocalResponse response;         ExecutorChallengeLocalResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         Strlcpy(challengeFilePath, response.challenge, EXECUTOR_BUFFER_SIZE);         Strlcpy(challengeFilePath, response.challenge, EXECUTOR_BUFFER_SIZE);
Line 939 
Line 939 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_AUTHENTICATE_LOCAL_MESSAGE;         header.code = EXECUTOR_AUTHENTICATE_LOCAL_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body.          // Send request body.
  
         ExecutorAuthenticateLocalRequest request;         ExecutorAuthenticateLocalRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         Strlcpy(request.challenge, challengeFilePath, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.challenge, challengeFilePath, EXECUTOR_BUFFER_SIZE);
         Strlcpy(request.response, response, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.response, response, EXECUTOR_BUFFER_SIZE);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorAuthenticateLocalResponse response_;         ExecutorAuthenticateLocalResponse response_;
  
         if (_recv(_sock, &response_, sizeof(response_)) != sizeof(response_))          if (RecvBlock(_sock, &response_, sizeof(response_)) !=
                   sizeof(response_))
           {
             return -1;             return -1;
           }
  
         return response_.status;         return response_.status;
     }     }
Line 972 
Line 975 
     {     {
         AutoMutex autoMutex(_mutex);         AutoMutex autoMutex(_mutex);
  
         // _send request header:          // Send request header:
  
         ExecutorRequestHeader header;         ExecutorRequestHeader header;
         header.code = EXECUTOR_UPDATE_LOG_LEVEL_MESSAGE;         header.code = EXECUTOR_UPDATE_LOG_LEVEL_MESSAGE;
  
         if (_send(_sock, &header, sizeof(header)) != sizeof(header))          if (SendBlock(_sock, &header, sizeof(header)) != sizeof(header))
             return -1;             return -1;
  
         // _send request body:          // Send request body:
  
         ExecutorUpdateLogLevelRequest request;         ExecutorUpdateLogLevelRequest request;
         memset(&request, 0, sizeof(request));         memset(&request, 0, sizeof(request));
         Strlcpy(request.logLevel, logLevel, EXECUTOR_BUFFER_SIZE);         Strlcpy(request.logLevel, logLevel, EXECUTOR_BUFFER_SIZE);
  
         if (_send(_sock, &request, sizeof(request)) != sizeof(request))          if (SendBlock(_sock, &request, sizeof(request)) != sizeof(request))
             return -1;             return -1;
  
         // Receive the response         // Receive the response
  
         ExecutorUpdateLogLevelResponse response;         ExecutorUpdateLogLevelResponse response;
  
         if (_recv(_sock, &response, sizeof(response)) != sizeof(response))          if (RecvBlock(_sock, &response, sizeof(response)) != sizeof(response))
             return -1;             return -1;
  
         return response.status;         return response.status;
Line 1001 
Line 1004 
  
 private: private:
  
     static ssize_t _recv(int sock, void* buffer, size_t size)  
     {  
         size_t r = size;  
         char* p = (char*)buffer;  
   
         if (size == 0)  
             return -1;  
   
         while (r)  
         {  
             ssize_t n;  
   
             EXECUTOR_RESTART(read(sock, p, r), n);  
   
             if (n == -1)  
                 return -1;  
             else if (n == 0)  
                 return size - r;  
   
             r -= n;  
             p += n;  
         }  
   
         return size - r;  
     }  
   
     static ssize_t _send(int sock, void* buffer, size_t size)  
     {  
         size_t r = size;  
         char* p = (char*)buffer;  
   
         while (r)  
         {  
             ssize_t n;  
             EXECUTOR_RESTART(write(sock, p, r), n);  
   
             if (n == -1)  
                 return -1;  
             else if (n == 0)  
                 return size - r;  
   
             r -= n;  
             p += n;  
         }  
   
         return size - r;  
     }  
   
     int _sock;     int _sock;
     Mutex _mutex;     Mutex _mutex;
 }; };

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2