Renamed class SocketBuffer to MessageBuffer and all its usages.

[Issue#] SSDWSSP-480 /1
[Feature] SocketBuffer class needed to be renamed to MessageBuffer.
[Cause] SocketBuffer is not right name for this class.
[Solution] Class was renamed.
[Verification] Build security-server and run security server tests on target.

Change-Id: I8fce6aef14308389e1148599e89b3e11939a36fd

diff --git a/src/server2/CMakeLists.txt b/src/server2/CMakeLists.txt
index 6bdceb4..154bf18 100644 (file)
--- a/src/server2/CMakeLists.txt
+++ b/src/server2/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(COMMON_PATH ${PROJECT_SOURCE_DIR}/src/server2)
 
 SET(COMMON_SOURCES
     ${COMMON_PATH}/common/protocols.cpp
-    ${COMMON_PATH}/common/socket-buffer.cpp
+    ${COMMON_PATH}/common/message-buffer.cpp
     ${COMMON_PATH}/dpl/log/src/abstract_log_provider.cpp
     ${COMMON_PATH}/dpl/log/src/dlog_log_provider.cpp
     ${COMMON_PATH}/dpl/log/src/log.cpp

diff --git a/src/server2/client/client-app-permissions.cpp b/src/server2/client/client-app-permissions.cpp
index 764ee09..9a0703b 100644 (file)
--- a/src/server2/client/client-app-permissions.cpp
+++ b/src/server2/client/client-app-permissions.cpp
@@ -29,7 +29,7 @@
 #include <dpl/log/log.h>
 #include <dpl/exception.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 #include <client-common.h>
 #include <protocols.h>
 
@@ -42,7 +42,7 @@ SECURITY_SERVER_API
 int security_server_app_enable_permissions(const char *app_id, app_type_t app_type, const char **perm_list, int persistent)
 {
     using namespace SecurityServer;
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     std::vector<std::string> permissions_list;
 
     LogDebug("security_server_app_enable_permissions() called");
@@ -85,8 +85,8 @@ int security_server_app_enable_permissions(const char *app_id, app_type_t app_ty
         Deserialization::Deserialize(recv, result);
         return result;
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {
@@ -101,7 +101,7 @@ SECURITY_SERVER_API
 int security_server_app_disable_permissions(const char *app_id, app_type_t app_type, const char **perm_list)
 {
     using namespace SecurityServer;
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     std::vector<std::string> permissions_list;
 
     LogDebug("security_server_app_disable_permissions() called");
@@ -142,8 +142,8 @@ int security_server_app_disable_permissions(const char *app_id, app_type_t app_t
         Deserialization::Deserialize(recv, result);
         return result;
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {

diff --git a/src/server2/client/client-common.cpp b/src/server2/client/client-common.cpp
index 10d017e..9534ad3 100644 (file)
--- a/src/server2/client/client-common.cpp
+++ b/src/server2/client/client-common.cpp
@@ -34,7 +34,7 @@
 #include <dpl/singleton.h>
 #include <dpl/singleton_safe_impl.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 
 #include <security-server.h>
 
@@ -167,7 +167,7 @@ private:
 namespace SecurityServer {
 
 
-int sendToServer(char const * const interface, const RawBuffer &send, SocketBuffer &recv) {
+int sendToServer(char const * const interface, const RawBuffer &send, MessageBuffer &recv) {
     int ret;
     SockRAII sock;
     ssize_t done = 0;

diff --git a/src/server2/client/client-common.h b/src/server2/client/client-common.h
index 667bd9d..fd8e07d 100644 (file)
--- a/src/server2/client/client-common.h
+++ b/src/server2/client/client-common.h
@@ -28,13 +28,13 @@
 
 #include <vector>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 
 namespace SecurityServer {
 
 typedef std::vector<unsigned char> RawBuffer;
 
-int sendToServer(char const * const interface, const RawBuffer &send, SocketBuffer &recv);
+int sendToServer(char const * const interface, const RawBuffer &send, MessageBuffer &recv);
 
 } // namespace SecuritySever
 

diff --git a/src/server2/client/client-cookie.cpp b/src/server2/client/client-cookie.cpp
index 7ca07d2..efa373d 100644 (file)
--- a/src/server2/client/client-cookie.cpp
+++ b/src/server2/client/client-cookie.cpp
@@ -28,7 +28,7 @@
 #include <dpl/log/log.h>
 #include <dpl/exception.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 #include <client-common.h>
 #include <protocols.h>
 
@@ -46,7 +46,7 @@ SECURITY_SERVER_API
 int security_server_request_cookie(char *cookie, size_t bufferSize)
 {
     using namespace SecurityServer;
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     std::vector<char> receivedCookie;
 
     LogDebug("security_server_request_cookie() called");
@@ -86,8 +86,8 @@ int security_server_request_cookie(char *cookie, size_t bufferSize)
         memcpy(cookie, &receivedCookie[0], receivedCookie.size());
         return retval;
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {
@@ -101,7 +101,7 @@ SECURITY_SERVER_API
 int security_server_get_cookie_pid(const char *cookie)
 {
     using namespace SecurityServer;
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     int pid;
     int retval = SECURITY_SERVER_API_ERROR_UNKNOWN;
 
@@ -133,8 +133,8 @@ int security_server_get_cookie_pid(const char *cookie)
         Deserialization::Deserialize(recv, pid);
         return pid;
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {
@@ -148,7 +148,7 @@ SECURITY_SERVER_API
 char * security_server_get_smacklabel_cookie(const char *cookie)
 {
     using namespace SecurityServer;
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     int retval = SECURITY_SERVER_API_ERROR_UNKNOWN;
     std::string label;
 
@@ -181,8 +181,8 @@ char * security_server_get_smacklabel_cookie(const char *cookie)
 
         return strdup(label.c_str());
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {
@@ -196,7 +196,7 @@ SECURITY_SERVER_API
 int security_server_check_privilege(const char *cookie, gid_t privilege)
 {
     using namespace SecurityServer;
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     int retval = SECURITY_SERVER_API_ERROR_UNKNOWN;
 
     LogDebug("security_server_check_privilege() called");
@@ -224,8 +224,8 @@ int security_server_check_privilege(const char *cookie, gid_t privilege)
         Deserialization::Deserialize(recv, retval);
         return retval;
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {
@@ -239,7 +239,7 @@ SECURITY_SERVER_API
 int security_server_check_privilege_by_cookie(const char *cookie, const char *object, const char *access_rights)
 {
     using namespace SecurityServer;
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     int retval = SECURITY_SERVER_API_ERROR_UNKNOWN;
 
     LogDebug("security_server_check_privilege_by_cookie() called");
@@ -271,8 +271,8 @@ int security_server_check_privilege_by_cookie(const char *cookie, const char *ob
         Deserialization::Deserialize(recv, retval);
         return retval;
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {
@@ -286,7 +286,7 @@ SECURITY_SERVER_API
 int security_server_get_uid_by_cookie(const char *cookie, uid_t *uid)
 {
     using namespace SecurityServer;
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     int retval = SECURITY_SERVER_API_ERROR_UNKNOWN;
 
     LogDebug("security_server_get_uid_by_cookie() called");
@@ -319,8 +319,8 @@ int security_server_get_uid_by_cookie(const char *cookie, uid_t *uid)
 
         return retval;
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {
@@ -334,7 +334,7 @@ SECURITY_SERVER_API
 int security_server_get_gid_by_cookie(const char *cookie, gid_t *gid)
 {
     using namespace SecurityServer;
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     int retval = SECURITY_SERVER_API_ERROR_UNKNOWN;
 
     LogDebug("security_server_get_uid_by_cookie() called");
@@ -367,8 +367,8 @@ int security_server_get_gid_by_cookie(const char *cookie, gid_t *gid)
 
         return retval;
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {

diff --git a/src/server2/client/client-get-gid.cpp b/src/server2/client/client-get-gid.cpp
index 1decca8..96ac70e 100644 (file)
--- a/src/server2/client/client-get-gid.cpp
+++ b/src/server2/client/client-get-gid.cpp
@@ -27,7 +27,7 @@
 #include <dpl/log/log.h>
 #include <dpl/exception.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 #include <client-common.h>
 #include <protocols.h>
 
@@ -49,7 +49,7 @@ int security_server_get_gid(const char *objectName) {
             return SECURITY_SERVER_API_ERROR_INPUT_PARAM;
         }
 
-        SocketBuffer send, recv;
+        MessageBuffer send, recv;
         Serialization::Serialize(send, std::string(objectName));
 
         int retCode = sendToServer(
@@ -70,8 +70,8 @@ int security_server_get_gid(const char *objectName) {
         gid_t gid;
         Deserialization::Deserialize(recv, gid);
         return gid;
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {

diff --git a/src/server2/client/client-get-object-name.cpp b/src/server2/client/client-get-object-name.cpp
index c259a13..f7df552 100644 (file)
--- a/src/server2/client/client-get-object-name.cpp
+++ b/src/server2/client/client-get-object-name.cpp
@@ -27,7 +27,7 @@
 #include <dpl/log/log.h>
 #include <dpl/exception.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 #include <client-common.h>
 #include <protocols.h>
 
@@ -44,7 +44,7 @@ int security_server_get_object_name(gid_t gid, char *pObjectName, size_t maxObje
             return SECURITY_SERVER_API_ERROR_INPUT_PARAM;
         }
 
-        SocketBuffer send, recv;
+        MessageBuffer send, recv;
         Serialization::Serialize(send, gid);
 
         int result = sendToServer(
@@ -70,8 +70,8 @@ int security_server_get_object_name(gid_t gid, char *pObjectName, size_t maxObje
 
         return result;
 
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {

diff --git a/src/server2/client/client-privilege-by-pid.cpp b/src/server2/client/client-privilege-by-pid.cpp
index cc35122..9315487 100644 (file)
--- a/src/server2/client/client-privilege-by-pid.cpp
+++ b/src/server2/client/client-privilege-by-pid.cpp
@@ -28,7 +28,7 @@
 #include <dpl/log/log.h>
 #include <dpl/exception.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 #include <client-common.h>
 #include <protocols.h>
 #include <smack-check.h>
@@ -63,7 +63,7 @@ int security_server_check_privilege_by_pid(
             return SECURITY_SERVER_API_ERROR_INPUT_PARAM;
         }
 
-        SocketBuffer send, recv;
+        MessageBuffer send, recv;
         Serialization::Serialize(send, pid);
         Serialization::Serialize(send, std::string(object));
         Serialization::Serialize(send, std::string(access_rights));
@@ -78,8 +78,8 @@ int security_server_check_privilege_by_pid(
 
         Deserialization::Deserialize(recv, result);
         return result;
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {

diff --git a/src/server2/client/client-shared-memory.cpp b/src/server2/client/client-shared-memory.cpp
index a71da76..66e6fc7 100644 (file)
--- a/src/server2/client/client-shared-memory.cpp
+++ b/src/server2/client/client-shared-memory.cpp
@@ -27,7 +27,7 @@
 #include <dpl/log/log.h>
 #include <dpl/exception.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 #include <client-common.h>
 #include <protocols.h>
 #include <smack-check.h>
@@ -48,7 +48,7 @@ int security_server_app_give_access(const char *customer_label, int customer_pid
             return SECURITY_SERVER_API_ERROR_INPUT_PARAM;
         }
 
-        SocketBuffer send, recv;
+        MessageBuffer send, recv;
         Serialization::Serialize(send, std::string(customer_label));
         Serialization::Serialize(send, customer_pid);
 
@@ -62,8 +62,8 @@ int security_server_app_give_access(const char *customer_label, int customer_pid
 
         Deserialization::Deserialize(recv, result);
         return result;
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {

diff --git a/src/server2/client/client-socket-privilege.cpp b/src/server2/client/client-socket-privilege.cpp
index bca7c3d..4358b07 100644 (file)
--- a/src/server2/client/client-socket-privilege.cpp
+++ b/src/server2/client/client-socket-privilege.cpp
@@ -29,7 +29,7 @@
 #include <dpl/log/log.h>
 #include <dpl/exception.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 #include <client-common.h>
 #include <protocols.h>
 #include <smack-check.h>
@@ -42,7 +42,7 @@ static int get_exec_path(pid_t pid, std::string &exe)
     using namespace SecurityServer;
 
     try{
-        SocketBuffer send, recv;
+        MessageBuffer send, recv;
         Serialization::Serialize(send, pid);
 
         int result = sendToServer(
@@ -58,8 +58,8 @@ static int get_exec_path(pid_t pid, std::string &exe)
 
         Deserialization::Deserialize(recv, exe);
         return result;
-    } catch (SocketBuffer::Exception::Base &e) {
-        LogDebug("SecurityServer::SocketBuffer::Exception " << e.DumpToString());
+    } catch (MessageBuffer::Exception::Base &e) {
+        LogDebug("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogDebug("STD exception " << e.what());
     } catch (...) {

diff --git a/src/server2/common/socket-buffer.cpp b/src/server2/common/message-buffer.cpp
similarity index 83%
rename from src/server2/common/socket-buffer.cpp
rename to src/server2/common/message-buffer.cpp
index 682547a..3fc090b 100644 (file)
--- a/src/server2/common/socket-buffer.cpp
+++ b/src/server2/common/message-buffer.cpp
@@ -16,23 +16,23 @@
  *  limitations under the License
  */
 /*
- * @file        socket-buffer.cpp
+ * @file        message-buffer.cpp
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
- * @brief       Implementation of SocketBuffer.
+ * @brief       Implementation of MessageBuffer.
  */
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 
 #include <dpl/log/log.h>
 
 namespace SecurityServer {
 
-void SocketBuffer::Push(const RawBuffer &data) {
+void MessageBuffer::Push(const RawBuffer &data) {
     m_buffer.AppendCopy(&data[0], data.size());
 }
 
-RawBuffer SocketBuffer::Pop() {
+RawBuffer MessageBuffer::Pop() {
     size_t size = m_buffer.Size();
     RawBuffer buffer;
     buffer.resize(size + sizeof(size_t));
@@ -41,7 +41,7 @@ RawBuffer SocketBuffer::Pop() {
     return buffer;
 }
 
-bool SocketBuffer::Ready() {
+bool MessageBuffer::Ready() {
     CountBytesLeft();
     if (m_bytesLeft == 0)
         return false;
@@ -50,7 +50,7 @@ bool SocketBuffer::Ready() {
     return true;
 }
 
-void SocketBuffer::Read(size_t num, void *bytes) {
+void MessageBuffer::Read(size_t num, void *bytes) {
     CountBytesLeft();
     if (num > m_bytesLeft) {
         LogDebug("Protocol broken. OutOfData. Asked for: " << num << " Ready: " << m_bytesLeft << " Buffer.size(): " << m_buffer.Size());
@@ -61,7 +61,7 @@ void SocketBuffer::Read(size_t num, void *bytes) {
     m_bytesLeft -= num;
 }
 
-void SocketBuffer::Write(size_t num, const void *bytes) {
+void MessageBuffer::Write(size_t num, const void *bytes) {
     m_buffer.AppendCopy(bytes, num);
 }
 

diff --git a/src/server2/common/socket-buffer.h b/src/server2/common/message-buffer.h
similarity index 94%
rename from src/server2/common/socket-buffer.h
rename to src/server2/common/message-buffer.h
index 34b58fa..850c7de 100644 (file)
--- a/src/server2/common/socket-buffer.h
+++ b/src/server2/common/message-buffer.h
@@ -19,7 +19,7 @@
  * @file        secket-buffer.h
  * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
  * @version     1.0
- * @brief       Implementatin of SocketBuffer.
+ * @brief       Implementatin of MessageBuffer.
  */
 
 #ifndef _SECURITY_SERVER_SOCKET_BUFFER_
@@ -35,7 +35,7 @@ namespace SecurityServer {
 
 typedef std::vector<unsigned char> RawBuffer;
 
-class SocketBuffer : public SecurityServer::IStream {
+class MessageBuffer : public SecurityServer::IStream {
 public:
     class Exception
     {
@@ -44,7 +44,7 @@ public:
         DECLARE_EXCEPTION_TYPE(Base, OutOfData)
     };
 
-    SocketBuffer()
+    MessageBuffer()
       : m_bytesLeft(0)
     {}
 

diff --git a/src/server2/service/app-permissions.cpp b/src/server2/service/app-permissions.cpp
index d34ac5b..1c10030 100644 (file)
--- a/src/server2/service/app-permissions.cpp
+++ b/src/server2/service/app-permissions.cpp
@@ -79,7 +79,7 @@ void AppPermissionsService::write(const WriteEvent &event) {
 
 void AppPermissionsService::read(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
-    auto &buffer = m_socketBufferMap[event.connectionID.counter];
+    auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
@@ -89,7 +89,7 @@ void AppPermissionsService::read(const ReadEvent &event) {
 
 void AppPermissionsService::close(const CloseEvent &event) {
     LogDebug("CloseEvent. ConnectionID: " << event.connectionID.sock);
-    m_socketBufferMap.erase(event.connectionID.counter);
+    m_messageBufferMap.erase(event.connectionID.counter);
 }
 
 void AppPermissionsService::error(const ErrorEvent &event) {
@@ -97,10 +97,10 @@ void AppPermissionsService::error(const ErrorEvent &event) {
     m_serviceManager->Close(event.connectionID);
 }
 
-bool AppPermissionsService::readOne(const ConnectionID &conn, SocketBuffer &buffer)
+bool AppPermissionsService::readOne(const ConnectionID &conn, MessageBuffer &buffer)
 {
     LogDebug("Iteration begin");
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     std::vector<std::string> permissions_list;
     std::string app_id;
     int persistent;
@@ -129,7 +129,7 @@ bool AppPermissionsService::readOne(const ConnectionID &conn, SocketBuffer &buff
         app_type = (app_type_t)temp;
         Deserialization::Deserialize(buffer, app_id);
         Deserialization::Deserialize(buffer, permissions_list);
-    } Catch (SocketBuffer::Exception::Base) {
+    } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         m_serviceManager->Close(conn);
         return false;

diff --git a/src/server2/service/app-permissions.h b/src/server2/service/app-permissions.h
index 2030ca6..301f2be 100644 (file)
--- a/src/server2/service/app-permissions.h
+++ b/src/server2/service/app-permissions.h
@@ -29,7 +29,7 @@
 #include <service-thread.h>
 #include <generic-socket-manager.h>
 #include <dpl/serialization.h>
-#include <socket-buffer.h>
+#include <message-buffer.h>
 #include <security-server-common.h>
 
 namespace SecurityServer {
@@ -39,7 +39,7 @@ class AppPermissionsService  :
   , public SecurityServer::ServiceThread<AppPermissionsService>
 {
 public:
-    typedef std::map<int, SocketBuffer> SocketBufferMap;
+    typedef std::map<int, MessageBuffer> MessageBufferMap;
 
     ServiceDescriptionVector GetServiceDescription();
 
@@ -56,9 +56,9 @@ public:
     void error(const ErrorEvent &event);
 
 private:
-    bool readOne(const ConnectionID &conn, SocketBuffer &buffer);
+    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
 
-    SocketBufferMap m_socketBufferMap;
+    MessageBufferMap m_messageBufferMap;
 };
 
 } // namespace SecurityServer

diff --git a/src/server2/service/cookie.cpp b/src/server2/service/cookie.cpp
index 1b28f85..07c6b11 100644 (file)
--- a/src/server2/service/cookie.cpp
+++ b/src/server2/service/cookie.cpp
@@ -98,10 +98,10 @@ void CookieService::error(const ErrorEvent &event) {
     m_serviceManager->Close(event.connectionID);
 }
 
-bool CookieService::readOne(const ConnectionID &conn, SocketBuffer &buffer, int interfaceID)
+bool CookieService::readOne(const ConnectionID &conn, MessageBuffer &buffer, int interfaceID)
 {
     LogDebug("Iteration begin");
-    SocketBuffer send, recv;
+    MessageBuffer send, recv;
     int msgType;
     bool removeGarbage = false;
 
@@ -113,7 +113,7 @@ bool CookieService::readOne(const ConnectionID &conn, SocketBuffer &buffer, int
     //receive data from buffer and check MSG_ID
     Try {
         Deserialization::Deserialize(buffer, msgType);  //receive MSG_ID
-    } Catch (SocketBuffer::Exception::Base) {
+    } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         m_serviceManager->Close(conn);
         return false;
@@ -200,7 +200,7 @@ bool CookieService::readOne(const ConnectionID &conn, SocketBuffer &buffer, int
     return retval;
 }
 
-bool CookieService::cookieRequest(SocketBuffer &send, int socket)
+bool CookieService::cookieRequest(MessageBuffer &send, int socket)
 {
     struct ucred cr;
     unsigned len = sizeof(cr);
@@ -221,13 +221,13 @@ bool CookieService::cookieRequest(SocketBuffer &send, int socket)
     return true;
 }
 
-bool CookieService::pidByCookieRequest(SocketBuffer &buffer, SocketBuffer &send)
+bool CookieService::pidByCookieRequest(MessageBuffer &buffer, MessageBuffer &send)
 {
     std::vector<char> cookieKey;
 
     Try {
         Deserialization::Deserialize(buffer, cookieKey);
-    } Catch (SocketBuffer::Exception::Base) {
+    } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         return false;
     }
@@ -247,13 +247,13 @@ bool CookieService::pidByCookieRequest(SocketBuffer &buffer, SocketBuffer &send)
     return true;
 }
 
-bool CookieService::smackLabelByCookieRequest(SocketBuffer &buffer, SocketBuffer &send)
+bool CookieService::smackLabelByCookieRequest(MessageBuffer &buffer, MessageBuffer &send)
 {
     std::vector<char> cookieKey;
 
     Try {
         Deserialization::Deserialize(buffer, cookieKey);
-    } Catch (SocketBuffer::Exception::Base) {
+    } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         return false;
     }
@@ -273,7 +273,7 @@ bool CookieService::smackLabelByCookieRequest(SocketBuffer &buffer, SocketBuffer
     return true;
 }
 
-bool CookieService::privilegeByCookieGidRequest(SocketBuffer &buffer, SocketBuffer &send)
+bool CookieService::privilegeByCookieGidRequest(MessageBuffer &buffer, MessageBuffer &send)
 {
     std::vector<char> cookieKey;
     int gid;
@@ -281,7 +281,7 @@ bool CookieService::privilegeByCookieGidRequest(SocketBuffer &buffer, SocketBuff
     Try {
         Deserialization::Deserialize(buffer, cookieKey);
         Deserialization::Deserialize(buffer, gid);
-    } Catch (SocketBuffer::Exception::Base) {
+    } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         return false;
     }
@@ -304,7 +304,7 @@ bool CookieService::privilegeByCookieGidRequest(SocketBuffer &buffer, SocketBuff
     return true;
 }
 
-bool CookieService::privilegeByCookieRequest(SocketBuffer &buffer, SocketBuffer &send)
+bool CookieService::privilegeByCookieRequest(MessageBuffer &buffer, MessageBuffer &send)
 {
     std::vector<char> cookieKey;
     std::string subject;
@@ -315,7 +315,7 @@ bool CookieService::privilegeByCookieRequest(SocketBuffer &buffer, SocketBuffer
         Deserialization::Deserialize(buffer, cookieKey);
         Deserialization::Deserialize(buffer, object);
         Deserialization::Deserialize(buffer, access);
-    } Catch (SocketBuffer::Exception::Base) {
+    } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         return false;
     }
@@ -339,13 +339,13 @@ bool CookieService::privilegeByCookieRequest(SocketBuffer &buffer, SocketBuffer
     return true;
 }
 
-bool CookieService::uidByCookieRequest(SocketBuffer &buffer, SocketBuffer &send)
+bool CookieService::uidByCookieRequest(MessageBuffer &buffer, MessageBuffer &send)
 {
     std::vector<char> cookieKey;
 
     Try {
         Deserialization::Deserialize(buffer, cookieKey);
-    } Catch (SocketBuffer::Exception::Base) {
+    } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         return false;
     }
@@ -365,13 +365,13 @@ bool CookieService::uidByCookieRequest(SocketBuffer &buffer, SocketBuffer &send)
     return true;
 }
 
-bool CookieService::gidByCookieRequest(SocketBuffer &buffer, SocketBuffer &send)
+bool CookieService::gidByCookieRequest(MessageBuffer &buffer, MessageBuffer &send)
 {
     std::vector<char> cookieKey;
 
     Try {
         Deserialization::Deserialize(buffer, cookieKey);
-    } Catch (SocketBuffer::Exception::Base) {
+    } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         return false;
     }

diff --git a/src/server2/service/cookie.h b/src/server2/service/cookie.h
index 78ee0fd..ad4ee3b 100644 (file)
--- a/src/server2/service/cookie.h
+++ b/src/server2/service/cookie.h
@@ -28,7 +28,7 @@
 #include <service-thread.h>
 #include <generic-socket-manager.h>
 #include <dpl/serialization.h>
-#include <socket-buffer.h>
+#include <message-buffer.h>
 #include <security-server-common.h>
 #include <cookie-jar.h>
 
@@ -42,7 +42,7 @@ public:
     struct SocketInfo
     {
         int interfaceID;
-        SocketBuffer buffer;
+        MessageBuffer buffer;
     };
 
     typedef std::map<int, SocketInfo> SocketInfoMap;
@@ -62,17 +62,17 @@ public:
     void error(const ErrorEvent &event);
 
 private:
-    bool readOne(const ConnectionID &conn, SocketBuffer &buffer, int interfaceID);
+    bool readOne(const ConnectionID &conn, MessageBuffer &buffer, int interfaceID);
 
-    bool cookieRequest(SocketBuffer &send, int socket);
+    bool cookieRequest(MessageBuffer &send, int socket);
 
-    bool pidByCookieRequest(SocketBuffer &buffer, SocketBuffer &send);
-    bool smackLabelByCookieRequest(SocketBuffer &buffer, SocketBuffer &send);
-    bool privilegeByCookieGidRequest(SocketBuffer &buffer, SocketBuffer &send);
-    bool privilegeByCookieRequest(SocketBuffer &buffer, SocketBuffer &send);
+    bool pidByCookieRequest(MessageBuffer &buffer, MessageBuffer &send);
+    bool smackLabelByCookieRequest(MessageBuffer &buffer, MessageBuffer &send);
+    bool privilegeByCookieGidRequest(MessageBuffer &buffer, MessageBuffer &send);
+    bool privilegeByCookieRequest(MessageBuffer &buffer, MessageBuffer &send);
 
-    bool uidByCookieRequest(SocketBuffer &buffer, SocketBuffer &send);
-    bool gidByCookieRequest(SocketBuffer &buffer, SocketBuffer &send);
+    bool uidByCookieRequest(MessageBuffer &buffer, MessageBuffer &send);
+    bool gidByCookieRequest(MessageBuffer &buffer, MessageBuffer &send);
 
     CookieJar m_cookieJar;
 

diff --git a/src/server2/service/data-share.cpp b/src/server2/service/data-share.cpp
index 2a9b820..6f6200c 100644 (file)
--- a/src/server2/service/data-share.cpp
+++ b/src/server2/service/data-share.cpp
@@ -77,7 +77,7 @@ void SharedMemoryService::write(const WriteEvent &event) {
         m_serviceManager->Close(event.connectionID);
 }
 
-bool SharedMemoryService::readOne(const ConnectionID &conn, SocketBuffer &buffer) {
+bool SharedMemoryService::readOne(const ConnectionID &conn, MessageBuffer &buffer) {
     LogDebug("Iteration begin");
     static const char * const revoke = "-----";
     static const char * const permissions = "rwxat";
@@ -94,7 +94,7 @@ bool SharedMemoryService::readOne(const ConnectionID &conn, SocketBuffer &buffer
     Try {
         Deserialization::Deserialize(buffer, clientLabel);
         Deserialization::Deserialize(buffer, clientPid);
-     } Catch (SocketBuffer::Exception::Base) {
+     } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         m_serviceManager->Close(conn);
         return false;
@@ -137,7 +137,7 @@ end:
     free(providerLabel);
     smack_accesses_free(smack);
 
-    SocketBuffer sendBuffer;
+    MessageBuffer sendBuffer;
     Serialization::Serialize(sendBuffer, retCode);
     m_serviceManager->Write(conn, sendBuffer.Pop());
     return true;
@@ -145,7 +145,7 @@ end:
 
 void SharedMemoryService::read(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
-    auto &buffer = m_socketBufferMap[event.connectionID.counter];
+    auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
@@ -155,7 +155,7 @@ void SharedMemoryService::read(const ReadEvent &event) {
 
 void SharedMemoryService::close(const CloseEvent &event) {
     LogDebug("CloseEvent. ConnectionID: " << event.connectionID.sock);
-    m_socketBufferMap.erase(event.connectionID.counter);
+    m_messageBufferMap.erase(event.connectionID.counter);
 }
 
 void SharedMemoryService::error(const ErrorEvent &event) {

diff --git a/src/server2/service/data-share.h b/src/server2/service/data-share.h
index e035978..019b05a 100644 (file)
--- a/src/server2/service/data-share.h
+++ b/src/server2/service/data-share.h
@@ -28,7 +28,7 @@
 #include <service-thread.h>
 #include <generic-socket-manager.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 
 namespace SecurityServer {
 
@@ -37,7 +37,7 @@ class SharedMemoryService
   , public SecurityServer::ServiceThread<SharedMemoryService>
 {
 public:
-    typedef std::map<int, SocketBuffer> SocketBufferMap;
+    typedef std::map<int, MessageBuffer> MessageBufferMap;
 
     ServiceDescriptionVector GetServiceDescription();
 
@@ -53,9 +53,9 @@ public:
     void close(const CloseEvent &event);
     void error(const ErrorEvent &event);
 private:
-    bool readOne(const ConnectionID &conn, SocketBuffer &buffer);
+    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
 
-    SocketBufferMap m_socketBufferMap;
+    MessageBufferMap m_messageBufferMap;
 };
 
 } // namespace SecurityServer

diff --git a/src/server2/service/echo.h b/src/server2/service/echo.h
index 093537f..9446f3b 100644 (file)
--- a/src/server2/service/echo.h
+++ b/src/server2/service/echo.h
@@ -30,7 +30,7 @@
 
 #include <dpl/serialization.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 
 namespace SecurityServer {
 

diff --git a/src/server2/service/exec-path.cpp b/src/server2/service/exec-path.cpp
index 6948134..262ea2a 100644 (file)
--- a/src/server2/service/exec-path.cpp
+++ b/src/server2/service/exec-path.cpp
@@ -80,7 +80,7 @@ void ExecPathService::write(const WriteEvent &event) {
         m_serviceManager->Close(event.connectionID);
 }
 
-bool ExecPathService::processOne(const ConnectionID &conn, SocketBuffer &buffer) {
+bool ExecPathService::processOne(const ConnectionID &conn, MessageBuffer &buffer) {
     LogDebug("Processing message");
 
     int pid = 0;
@@ -92,13 +92,13 @@ bool ExecPathService::processOne(const ConnectionID &conn, SocketBuffer &buffer)
 
     Try {
         Deserialization::Deserialize(buffer, pid);
-     } Catch (SocketBuffer::Exception::Base) {
+     } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         m_serviceManager->Close(conn);
         return false;
     }
 
-    SocketBuffer sendBuffer;
+    MessageBuffer sendBuffer;
     int retVal;
 
     // get executable path
@@ -126,7 +126,7 @@ bool ExecPathService::processOne(const ConnectionID &conn, SocketBuffer &buffer)
 
 void ExecPathService::read(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
-    auto &buffer = m_socketBufferMap[event.connectionID.counter];
+    auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
@@ -136,7 +136,7 @@ void ExecPathService::read(const ReadEvent &event) {
 
 void ExecPathService::close(const CloseEvent &event) {
     LogDebug("CloseEvent. ConnectionID: " << event.connectionID.sock);
-    m_socketBufferMap.erase(event.connectionID.counter);
+    m_messageBufferMap.erase(event.connectionID.counter);
 }
 
 void ExecPathService::error(const ErrorEvent &event) {

diff --git a/src/server2/service/exec-path.h b/src/server2/service/exec-path.h
index 0832acb..89ad1b2 100644 (file)
--- a/src/server2/service/exec-path.h
+++ b/src/server2/service/exec-path.h
@@ -28,7 +28,7 @@
 #include <service-thread.h>
 #include <generic-socket-manager.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 
 namespace SecurityServer {
 
@@ -37,7 +37,7 @@ class ExecPathService
   , public SecurityServer::ServiceThread<ExecPathService>
 {
 public:
-    typedef std::map<int, SocketBuffer> SocketBufferMap;
+    typedef std::map<int, MessageBuffer> MessageBufferMap;
 
     ServiceDescriptionVector GetServiceDescription();
 
@@ -53,8 +53,8 @@ public:
     void close(const CloseEvent &event);
     void error(const ErrorEvent &event);
 private:
-    bool processOne(const ConnectionID &conn, SocketBuffer &buffer);
-    SocketBufferMap m_socketBufferMap;
+    bool processOne(const ConnectionID &conn, MessageBuffer &buffer);
+    MessageBufferMap m_messageBufferMap;
 };
 
 } // namespace SecurityServer

diff --git a/src/server2/service/get-gid.cpp b/src/server2/service/get-gid.cpp
index 298133b..58a8500 100644 (file)
--- a/src/server2/service/get-gid.cpp
+++ b/src/server2/service/get-gid.cpp
@@ -116,7 +116,7 @@ int GetGidService::setGid(std::string& obj)
 }
 
 
-bool GetGidService::readOne(const ConnectionID &conn, SocketBuffer &buffer) {
+bool GetGidService::readOne(const ConnectionID &conn, MessageBuffer &buffer) {
     LogDebug("Iteration begin");
     std::string objectName;
     int retCode = SECURITY_SERVER_API_ERROR_SERVER_ERROR;
@@ -128,7 +128,7 @@ bool GetGidService::readOne(const ConnectionID &conn, SocketBuffer &buffer) {
     // Get objects name:
     Try {
         Deserialization::Deserialize(buffer, objectName);
-     } Catch (SocketBuffer::Exception::Base) {
+     } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         m_serviceManager->Close(conn);
         return false;
@@ -138,7 +138,7 @@ bool GetGidService::readOne(const ConnectionID &conn, SocketBuffer &buffer) {
     retCode = setGid(objectName);
 
     // Send the result
-    SocketBuffer sendBuffer;
+    MessageBuffer sendBuffer;
     Serialization::Serialize(sendBuffer, retCode);
     Serialization::Serialize(sendBuffer, m_gid);
     m_serviceManager->Write(conn, sendBuffer.Pop());
@@ -147,7 +147,7 @@ bool GetGidService::readOne(const ConnectionID &conn, SocketBuffer &buffer) {
 
 void GetGidService::read(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
-    auto &buffer = m_socketBufferMap[event.connectionID.counter];
+    auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
@@ -157,7 +157,7 @@ void GetGidService::read(const ReadEvent &event) {
 
 void GetGidService::close(const CloseEvent &event) {
     LogDebug("CloseEvent. ConnectionID: " << event.connectionID.sock);
-    m_socketBufferMap.erase(event.connectionID.counter);
+    m_messageBufferMap.erase(event.connectionID.counter);
 }
 
 void GetGidService::error(const ErrorEvent &event) {

diff --git a/src/server2/service/get-gid.h b/src/server2/service/get-gid.h
index fd69124..c8c5e0a 100644 (file)
--- a/src/server2/service/get-gid.h
+++ b/src/server2/service/get-gid.h
@@ -29,7 +29,7 @@
 #include <generic-socket-manager.h>
 
 #include <dpl/serialization.h>
-#include <socket-buffer.h>
+#include <message-buffer.h>
 
 #include <security-server-common.h>
 
@@ -40,7 +40,7 @@ class GetGidService  :
   , public SecurityServer::ServiceThread<GetGidService>
 {
 public:
-    typedef std::map<int, SocketBuffer> SocketBufferMap;
+    typedef std::map<int, MessageBuffer> MessageBufferMap;
 
     ServiceDescriptionVector GetServiceDescription();
 
@@ -57,9 +57,9 @@ public:
     void error(const ErrorEvent &event);
 private:
     gid_t m_gid;
-    bool readOne(const ConnectionID &conn, SocketBuffer &buffer);
+    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
     int  setGid(std::string& objectName);
-    SocketBufferMap m_socketBufferMap;
+    MessageBufferMap m_messageBufferMap;
 };
 
 } // namespace SecurityServer

diff --git a/src/server2/service/get-object-name.cpp b/src/server2/service/get-object-name.cpp
index d973335..882c1dd 100644 (file)
--- a/src/server2/service/get-object-name.cpp
+++ b/src/server2/service/get-object-name.cpp
@@ -119,7 +119,7 @@ int GetObjectNameService::setName(const gid_t gid)
 }
 
 
-bool GetObjectNameService::readOne(const ConnectionID &conn, SocketBuffer &buffer) {
+bool GetObjectNameService::readOne(const ConnectionID &conn, MessageBuffer &buffer) {
     LogDebug("Iteration begin");
     gid_t gid;
     int retCode = SECURITY_SERVER_API_ERROR_SERVER_ERROR;
@@ -131,7 +131,7 @@ bool GetObjectNameService::readOne(const ConnectionID &conn, SocketBuffer &buffe
     // Get objects GID:
     Try {
         Deserialization::Deserialize(buffer, gid);
-     } Catch (SocketBuffer::Exception::Base) {
+     } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         m_serviceManager->Close(conn);
         return false;
@@ -141,7 +141,7 @@ bool GetObjectNameService::readOne(const ConnectionID &conn, SocketBuffer &buffe
     retCode = setName(gid);
 
     // Send the result
-    SocketBuffer sendBuffer;
+    MessageBuffer sendBuffer;
     Serialization::Serialize(sendBuffer, retCode);
     Serialization::Serialize(sendBuffer, m_name);
     m_serviceManager->Write(conn, sendBuffer.Pop());
@@ -150,7 +150,7 @@ bool GetObjectNameService::readOne(const ConnectionID &conn, SocketBuffer &buffe
 
 void GetObjectNameService::read(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
-    auto &buffer = m_socketBufferMap[event.connectionID.counter];
+    auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
@@ -160,7 +160,7 @@ void GetObjectNameService::read(const ReadEvent &event) {
 
 void GetObjectNameService::close(const CloseEvent &event) {
     LogDebug("CloseEvent. ConnectionID: " << event.connectionID.sock);
-    m_socketBufferMap.erase(event.connectionID.counter);
+    m_messageBufferMap.erase(event.connectionID.counter);
 }
 
 void GetObjectNameService::error(const ErrorEvent &event) {

diff --git a/src/server2/service/get-object-name.h b/src/server2/service/get-object-name.h
index 5083788..c78871d 100644 (file)
--- a/src/server2/service/get-object-name.h
+++ b/src/server2/service/get-object-name.h
@@ -29,7 +29,7 @@
 #include <generic-socket-manager.h>
 
 #include <dpl/serialization.h>
-#include <socket-buffer.h>
+#include <message-buffer.h>
 
 #include <security-server-common.h>
 
@@ -40,7 +40,7 @@ class GetObjectNameService  :
   , public SecurityServer::ServiceThread<GetObjectNameService>
 {
 public:
-    typedef std::map<int, SocketBuffer> SocketBufferMap;
+    typedef std::map<int, MessageBuffer> MessageBufferMap;
 
     ServiceDescriptionVector GetServiceDescription();
 
@@ -58,11 +58,11 @@ public:
 
 private:
     std::string m_name;
-    bool readOne(const ConnectionID &conn, SocketBuffer &buffer);
+    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
     int  setName(gid_t gid);
-    SocketBufferMap m_socketBufferMap;
+    MessageBufferMap m_messageBufferMap;
 };
 
 } // namespace SecurityServer
 
-#endif // _SECURITY_SERVER_SERV_GET_OBJECT_NAME_
\ No newline at end of file
+#endif // _SECURITY_SERVER_SERV_GET_OBJECT_NAME_

diff --git a/src/server2/service/privilege-by-pid.cpp b/src/server2/service/privilege-by-pid.cpp
index baea49b..878409c 100644 (file)
--- a/src/server2/service/privilege-by-pid.cpp
+++ b/src/server2/service/privilege-by-pid.cpp
@@ -81,7 +81,7 @@ void PrivilegeByPidService::write(const WriteEvent &event) {
         m_serviceManager->Close(event.connectionID);
 }
 
-bool PrivilegeByPidService::readOne(const ConnectionID &conn, SocketBuffer &buffer) {
+bool PrivilegeByPidService::readOne(const ConnectionID &conn, MessageBuffer &buffer) {
     LogDebug("Iteration begin");
 
     int retval;
@@ -101,7 +101,7 @@ bool PrivilegeByPidService::readOne(const ConnectionID &conn, SocketBuffer &buff
         Deserialization::Deserialize(buffer, pid);
         Deserialization::Deserialize(buffer, object);
         Deserialization::Deserialize(buffer, access_rights);
-    } Catch (SocketBuffer::Exception::Base) {
+    } Catch (MessageBuffer::Exception::Base) {
         LogDebug("Broken protocol. Closing socket.");
         m_serviceManager->Close(conn);
         return false;
@@ -149,7 +149,7 @@ bool PrivilegeByPidService::readOne(const ConnectionID &conn, SocketBuffer &buff
     else                //there is no permission
         retCode = SECURITY_SERVER_API_ERROR_ACCESS_DENIED;
 
-    SocketBuffer sendBuffer;
+    MessageBuffer sendBuffer;
     Serialization::Serialize(sendBuffer, retCode);
     m_serviceManager->Write(conn, sendBuffer.Pop());
     return true;
@@ -157,7 +157,7 @@ bool PrivilegeByPidService::readOne(const ConnectionID &conn, SocketBuffer &buff
 
 void PrivilegeByPidService::read(const ReadEvent &event) {
     LogDebug("Read event for counter: " << event.connectionID.counter);
-    auto &buffer = m_socketBufferMap[event.connectionID.counter];
+    auto &buffer = m_messageBufferMap[event.connectionID.counter];
     buffer.Push(event.rawBuffer);
 
     // We can get several requests in one package.
@@ -167,7 +167,7 @@ void PrivilegeByPidService::read(const ReadEvent &event) {
 
 void PrivilegeByPidService::close(const CloseEvent &event) {
     LogDebug("CloseEvent. ConnectionID: " << event.connectionID.sock);
-    m_socketBufferMap.erase(event.connectionID.counter);
+    m_messageBufferMap.erase(event.connectionID.counter);
 }
 
 void PrivilegeByPidService::error(const ErrorEvent &event) {

diff --git a/src/server2/service/privilege-by-pid.h b/src/server2/service/privilege-by-pid.h
index a408376..386812e 100644 (file)
--- a/src/server2/service/privilege-by-pid.h
+++ b/src/server2/service/privilege-by-pid.h
@@ -27,7 +27,7 @@
 #include <service-thread.h>
 #include <generic-socket-manager.h>
 
-#include <socket-buffer.h>
+#include <message-buffer.h>
 
 namespace SecurityServer {
 
@@ -36,7 +36,7 @@ class PrivilegeByPidService
   , public SecurityServer::ServiceThread<PrivilegeByPidService>
 {
 public:
-    typedef std::map<int, SocketBuffer> SocketBufferMap;
+    typedef std::map<int, MessageBuffer> MessageBufferMap;
 
     ServiceDescriptionVector GetServiceDescription();
 
@@ -52,9 +52,9 @@ public:
     void close(const CloseEvent &event);
     void error(const ErrorEvent &event);
 private:
-    bool readOne(const ConnectionID &conn, SocketBuffer &buffer);
+    bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
 
-    SocketBufferMap m_socketBufferMap;
+    MessageBufferMap m_messageBufferMap;
 };
 
 } // namespace SecurityServer