Removed unused virtual method Event(ErrorEvent) from GenericSocketService and all...

[Issue#] SSDWSSP-480 /3
[Feature] Method Event(ErrorEvent) should be removed.
[Cause] It is not used so it is not needed.
[Solution] Method was removed.
[Verification] Build security-server and run security server tests on target.

Change-Id: If933780083e2bc8c0e644427c1e8ad768e2b4c1a

diff --git a/src/server2/main/generic-socket-manager.h b/src/server2/main/generic-socket-manager.h
index a0244b4..6b0f402 100644 (file)
--- a/src/server2/main/generic-socket-manager.h
+++ b/src/server2/main/generic-socket-manager.h
@@ -79,10 +79,6 @@ struct GenericSocketService {
         ConnectionID connectionID;
     };
 
-    struct ErrorEvent : public GenericEvent {
-        ConnectionID connectionID;
-    };
-
     virtual void SetSocketManager(GenericSocketManager *manager) {
         m_serviceManager = manager;
     }
@@ -92,7 +88,6 @@ struct GenericSocketService {
     virtual void Event(const WriteEvent &event) = 0;
     virtual void Event(const ReadEvent &event) = 0;
     virtual void Event(const CloseEvent &event) = 0;
-    virtual void Event(const ErrorEvent &event) = 0;
 
     GenericSocketService() : m_serviceManager(NULL) {}
     virtual ~GenericSocketService(){}

diff --git a/src/server2/main/socket-manager.cpp b/src/server2/main/socket-manager.cpp
index c9dd6d4..245e489 100644 (file)
--- a/src/server2/main/socket-manager.cpp
+++ b/src/server2/main/socket-manager.cpp
@@ -62,7 +62,6 @@ struct DummyService : public GenericSocketService {
     void Event(const WriteEvent &event) { (void)event; }
     void Event(const ReadEvent &event) { (void)event; }
     void Event(const CloseEvent &event) { (void)event; }
-    void Event(const ErrorEvent &event) { (void)event; }
 };
 
 struct SignalService : public GenericSocketService {
@@ -83,7 +82,6 @@ struct SignalService : public GenericSocketService {
     void Event(const AcceptEvent &event) { (void)event; } // not supported
     void Event(const WriteEvent &event) { (void)event; }  // not supported
     void Event(const CloseEvent &event) { (void)event; }  // not supported
-    void Event(const ErrorEvent &event) { (void)event; }  // not supported
 
     void Event(const ReadEvent &event) {
         LogDebug("Get signal information");

diff --git a/src/server2/service/app-permissions.cpp b/src/server2/service/app-permissions.cpp
index 1c10030..b108930 100644 (file)
--- a/src/server2/service/app-permissions.cpp
+++ b/src/server2/service/app-permissions.cpp
@@ -92,11 +92,6 @@ void AppPermissionsService::close(const CloseEvent &event) {
     m_messageBufferMap.erase(event.connectionID.counter);
 }
 
-void AppPermissionsService::error(const ErrorEvent &event) {
-    LogDebug("ErrorEvent. ConnectionID: " << event.connectionID.sock);
-    m_serviceManager->Close(event.connectionID);
-}
-
 bool AppPermissionsService::readOne(const ConnectionID &conn, MessageBuffer &buffer)
 {
     LogDebug("Iteration begin");

diff --git a/src/server2/service/app-permissions.h b/src/server2/service/app-permissions.h
index 301f2be..920a965 100644 (file)
--- a/src/server2/service/app-permissions.h
+++ b/src/server2/service/app-permissions.h
@@ -47,13 +47,11 @@ public:
     DECLARE_THREAD_EVENT(WriteEvent, write)
     DECLARE_THREAD_EVENT(ReadEvent, read)
     DECLARE_THREAD_EVENT(CloseEvent, close)
-    DECLARE_THREAD_EVENT(ErrorEvent, error)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
     void read(const ReadEvent &event);
     void close(const CloseEvent &event);
-    void error(const ErrorEvent &event);
 
 private:
     bool readOne(const ConnectionID &conn, MessageBuffer &buffer);

diff --git a/src/server2/service/cookie.cpp b/src/server2/service/cookie.cpp
index 07c6b11..634a27b 100644 (file)
--- a/src/server2/service/cookie.cpp
+++ b/src/server2/service/cookie.cpp
@@ -93,11 +93,6 @@ void CookieService::close(const CloseEvent &event) {
     m_socketInfoMap.erase(event.connectionID.counter);
 }
 
-void CookieService::error(const ErrorEvent &event) {
-    LogDebug("ErrorEvent. ConnectionID: " << event.connectionID.sock);
-    m_serviceManager->Close(event.connectionID);
-}
-
 bool CookieService::readOne(const ConnectionID &conn, MessageBuffer &buffer, int interfaceID)
 {
     LogDebug("Iteration begin");

diff --git a/src/server2/service/cookie.h b/src/server2/service/cookie.h
index ad4ee3b..0ab53c6 100644 (file)
--- a/src/server2/service/cookie.h
+++ b/src/server2/service/cookie.h
@@ -53,13 +53,11 @@ public:
     DECLARE_THREAD_EVENT(WriteEvent, write)
     DECLARE_THREAD_EVENT(ReadEvent, read)
     DECLARE_THREAD_EVENT(CloseEvent, close)
-    DECLARE_THREAD_EVENT(ErrorEvent, error)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
     void read(const ReadEvent &event);
     void close(const CloseEvent &event);
-    void error(const ErrorEvent &event);
 
 private:
     bool readOne(const ConnectionID &conn, MessageBuffer &buffer, int interfaceID);

diff --git a/src/server2/service/data-share.cpp b/src/server2/service/data-share.cpp
index 6f6200c..604e650 100644 (file)
--- a/src/server2/service/data-share.cpp
+++ b/src/server2/service/data-share.cpp
@@ -158,10 +158,5 @@ void SharedMemoryService::close(const CloseEvent &event) {
     m_messageBufferMap.erase(event.connectionID.counter);
 }
 
-void SharedMemoryService::error(const ErrorEvent &event) {
-    LogDebug("ErrorEvent. ConnectionID: " << event.connectionID.sock);
-    m_serviceManager->Close(event.connectionID);
-}
-
 } // namespace SecurityServer
 

diff --git a/src/server2/service/data-share.h b/src/server2/service/data-share.h
index 019b05a..106f502 100644 (file)
--- a/src/server2/service/data-share.h
+++ b/src/server2/service/data-share.h
@@ -45,13 +45,11 @@ public:
     DECLARE_THREAD_EVENT(WriteEvent, write)
     DECLARE_THREAD_EVENT(ReadEvent, read)
     DECLARE_THREAD_EVENT(CloseEvent, close)
-    DECLARE_THREAD_EVENT(ErrorEvent, error)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
     void read(const ReadEvent &event);
     void close(const CloseEvent &event);
-    void error(const ErrorEvent &event);
 private:
     bool readOne(const ConnectionID &conn, MessageBuffer &buffer);
 

diff --git a/src/server2/service/echo.cpp b/src/server2/service/echo.cpp
index 4bd7f13..5a0d60e 100644 (file)
--- a/src/server2/service/echo.cpp
+++ b/src/server2/service/echo.cpp
@@ -80,10 +80,5 @@ void EchoService::close(const CloseEvent &event) {
     LogDebug("CloseEvent. ConnectionID: " << event.connectionID.sock);
 }
 
-void EchoService::error(const ErrorEvent &event) {
-    LogDebug("ErrorEvent. ConnectionID: " << event.connectionID.sock);
-    m_serviceManager->Close(event.connectionID);
-}
-
 } // namespace SecurityServer
 

diff --git a/src/server2/service/echo.h b/src/server2/service/echo.h
index 9446f3b..cd1c529 100644 (file)
--- a/src/server2/service/echo.h
+++ b/src/server2/service/echo.h
@@ -45,13 +45,11 @@ public:
     DECLARE_THREAD_EVENT(WriteEvent, write)
     DECLARE_THREAD_EVENT(ReadEvent, read)
     DECLARE_THREAD_EVENT(CloseEvent, close)
-    DECLARE_THREAD_EVENT(ErrorEvent, error)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
     void read(const ReadEvent &event);
     void close(const CloseEvent &event);
-    void error(const ErrorEvent &event);
 };
 
 } // namespace SecurityServer

diff --git a/src/server2/service/exec-path.cpp b/src/server2/service/exec-path.cpp
index 262ea2a..9c8ac81 100644 (file)
--- a/src/server2/service/exec-path.cpp
+++ b/src/server2/service/exec-path.cpp
@@ -139,10 +139,5 @@ void ExecPathService::close(const CloseEvent &event) {
     m_messageBufferMap.erase(event.connectionID.counter);
 }
 
-void ExecPathService::error(const ErrorEvent &event) {
-    LogDebug("ErrorEvent. ConnectionID: " << event.connectionID.sock);
-    m_serviceManager->Close(event.connectionID);
-}
-
 } // namespace SecurityServer
 

diff --git a/src/server2/service/exec-path.h b/src/server2/service/exec-path.h
index 89ad1b2..4e004bb 100644 (file)
--- a/src/server2/service/exec-path.h
+++ b/src/server2/service/exec-path.h
@@ -45,13 +45,11 @@ public:
     DECLARE_THREAD_EVENT(WriteEvent, write)
     DECLARE_THREAD_EVENT(ReadEvent, read)
     DECLARE_THREAD_EVENT(CloseEvent, close)
-    DECLARE_THREAD_EVENT(ErrorEvent, error)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
     void read(const ReadEvent &event);
     void close(const CloseEvent &event);
-    void error(const ErrorEvent &event);
 private:
     bool processOne(const ConnectionID &conn, MessageBuffer &buffer);
     MessageBufferMap m_messageBufferMap;

diff --git a/src/server2/service/get-gid.cpp b/src/server2/service/get-gid.cpp
index 58a8500..dd0e884 100644 (file)
--- a/src/server2/service/get-gid.cpp
+++ b/src/server2/service/get-gid.cpp
@@ -160,10 +160,5 @@ void GetGidService::close(const CloseEvent &event) {
     m_messageBufferMap.erase(event.connectionID.counter);
 }
 
-void GetGidService::error(const ErrorEvent &event) {
-    LogDebug("ErrorEvent. ConnectionID: " << event.connectionID.sock);
-    m_serviceManager->Close(event.connectionID);
-}
-
 } // namespace SecurityServer
 

diff --git a/src/server2/service/get-gid.h b/src/server2/service/get-gid.h
index c8c5e0a..085b436 100644 (file)
--- a/src/server2/service/get-gid.h
+++ b/src/server2/service/get-gid.h
@@ -48,13 +48,11 @@ public:
     DECLARE_THREAD_EVENT(WriteEvent, write)
     DECLARE_THREAD_EVENT(ReadEvent, read)
     DECLARE_THREAD_EVENT(CloseEvent, close)
-    DECLARE_THREAD_EVENT(ErrorEvent, error)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
     void read(const ReadEvent &event);
     void close(const CloseEvent &event);
-    void error(const ErrorEvent &event);
 private:
     gid_t m_gid;
     bool readOne(const ConnectionID &conn, MessageBuffer &buffer);

diff --git a/src/server2/service/get-object-name.cpp b/src/server2/service/get-object-name.cpp
index 882c1dd..d6d5cdf 100644 (file)
--- a/src/server2/service/get-object-name.cpp
+++ b/src/server2/service/get-object-name.cpp
@@ -163,10 +163,5 @@ void GetObjectNameService::close(const CloseEvent &event) {
     m_messageBufferMap.erase(event.connectionID.counter);
 }
 
-void GetObjectNameService::error(const ErrorEvent &event) {
-    LogError("ErrorEvent. ConnectionID: " << event.connectionID.sock);
-    m_serviceManager->Close(event.connectionID);
-}
-
 } // namespace SecurityServer
 

diff --git a/src/server2/service/get-object-name.h b/src/server2/service/get-object-name.h
index c78871d..08e3574 100644 (file)
--- a/src/server2/service/get-object-name.h
+++ b/src/server2/service/get-object-name.h
@@ -48,13 +48,11 @@ public:
     DECLARE_THREAD_EVENT(WriteEvent, write)
     DECLARE_THREAD_EVENT(ReadEvent, read)
     DECLARE_THREAD_EVENT(CloseEvent, close)
-    DECLARE_THREAD_EVENT(ErrorEvent, error)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
     void read(const ReadEvent &event);
     void close(const CloseEvent &event);
-    void error(const ErrorEvent &event);
 
 private:
     std::string m_name;

diff --git a/src/server2/service/privilege-by-pid.cpp b/src/server2/service/privilege-by-pid.cpp
index 878409c..105625b 100644 (file)
--- a/src/server2/service/privilege-by-pid.cpp
+++ b/src/server2/service/privilege-by-pid.cpp
@@ -170,10 +170,5 @@ void PrivilegeByPidService::close(const CloseEvent &event) {
     m_messageBufferMap.erase(event.connectionID.counter);
 }
 
-void PrivilegeByPidService::error(const ErrorEvent &event) {
-    LogDebug("ErrorEvent. ConnectionID: " << event.connectionID.sock);
-    m_serviceManager->Close(event.connectionID);
-}
-
 } // namespace SecurityServer
 

diff --git a/src/server2/service/privilege-by-pid.h b/src/server2/service/privilege-by-pid.h
index 386812e..685bd19 100644 (file)
--- a/src/server2/service/privilege-by-pid.h
+++ b/src/server2/service/privilege-by-pid.h
@@ -44,13 +44,11 @@ public:
     DECLARE_THREAD_EVENT(WriteEvent, write)
     DECLARE_THREAD_EVENT(ReadEvent, read)
     DECLARE_THREAD_EVENT(CloseEvent, close)
-    DECLARE_THREAD_EVENT(ErrorEvent, error)
 
     void accept(const AcceptEvent &event);
     void write(const WriteEvent &event);
     void read(const ReadEvent &event);
     void close(const CloseEvent &event);
-    void error(const ErrorEvent &event);
 private:
     bool readOne(const ConnectionID &conn, MessageBuffer &buffer);