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 a0244b4d960a8c28a508c7314515de0f26501e0c..6b0f4020f4a09e31e989a0e8119fe316fd3cd555 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 c9dd6d488fba6bbaf67fcc19bc9f617ddf93da84..245e489826788e8102a924efb019cf904b14b0ca 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 1c10030ded3afb26fc10616b5ecd665e0c242506..b108930a6a408fc099d0db61ed8f98cfe1c3e2b3 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 301f2beaeb39c6e25a29ba7b6960dd0850ca860c..920a96553d51d6f25e0aa7e7e600ef6aa4bb7e66 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 07c6b112d2015b7b70aae2fb2e96fbe1c8522e07..634a27bd2feeca200dbf3a64099aec9d1cfd14b8 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 ad4ee3bdfacfbc9fc343032ced06a65a92aee96e..0ab53c68c626ff40ea6e08fd9bce4781a268bfcc 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 6f6200c5b7282b3f636dfa80f0d868a8043fb466..604e650b2420a3fb1fda61485237ca6b67caec15 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 019b05a74331c41343351561d6297c5411956acd..106f50213972b7959962fdf175553a9beaf858c4 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 4bd7f13e310b86c9332b09924101400b601ea649..5a0d60e996675c6f9a59d8dd793395679a20c030 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 9446f3b8fac900f14f2e40758ab9e77636b2fdc9..cd1c5290507e1ae6ae0ab26fab1aa2fc17127001 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 262ea2a926ec0a737906e9085f8e45be32125843..9c8ac8103d19856be228926afc1f8b2bf9819825 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 89ad1b2aedd7a84a927810049630817bd095da7f..4e004bb5e11eca7b6c6c6daf8db4b89c853fca0f 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 58a8500c2f91b8f7435c6a2386f48152a165c4db..dd0e884014645301d10282a0da9265490a690c19 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 c8c5e0a731dfa613889f1f872c4a76a3498c39cb..085b436f35c53b1d7e62e24937711dd2c870dc4f 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 882c1dd695d4eefb1fddfa5d7c076f6eaa5bd335..d6d5cdf07ece1d0ff37abdfefad8a9ff6c741582 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 c78871da168d3f71745b658ba27c5748d3c617a2..08e3574e2b2a634cd225dc2bf94a39b6c7ce0c4f 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 878409c0184eed87bac5fcc47ccbffa7a8d82a32..105625bba0c9f97b4d553f0d3922bda1b892aef9 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 386812ee14e7e21f4d1b57c2e38a4230be5eaa90..685bd19c0bc1ac58b164dcf942a4d1ebe12caf6e 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);