implement GetServiceId of CServiceClient and CServiceServer

eclipse-ecal · Jan 7, 2025 · f499437 · f499437
1 parent 379e75a
commit f499437
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 10 deletions.
diff --git a/ecal/core/include/ecal/ecal_client.h b/ecal/core/include/ecal/ecal_client.h
@@ -145,9 +145,6 @@ namespace eCAL
        *
        * @return  The service id.
       **/
-
-      // TODO: Implement this
-
       ECAL_API_EXPORTED_MEMBER
         Registration::SServiceMethodId GetServiceId() const;
 

diff --git a/ecal/core/include/ecal/ecal_server.h b/ecal/core/include/ecal/ecal_server.h
@@ -121,9 +121,6 @@ namespace eCAL
        *
        * @return  The service id.
       **/
-
-      // TODO: Implement this
-
       ECAL_API_EXPORTED_MEMBER
         Registration::SServiceMethodId GetServiceId() const;
 

diff --git a/ecal/core/src/service/ecal_service_client.cpp b/ecal/core/src/service/ecal_service_client.cpp
@@ -186,8 +186,8 @@ namespace eCAL
 
   Registration::SServiceMethodId CServiceClient::GetServiceId() const
   {
-    // TODO: Implement this
-    return Registration::SServiceMethodId();
+    if (m_service_client_impl == nullptr) return Registration::SServiceMethodId();
+    return m_service_client_impl->GetServiceId();
   }
 
   bool CServiceClient::IsConnected() const

diff --git a/ecal/core/src/service/ecal_service_client_impl.cpp b/ecal/core/src/service/ecal_service_client_impl.cpp
@@ -368,6 +368,20 @@ namespace eCAL
     return GetRegistrationSample();
   }
 
+  Registration::SServiceMethodId CServiceClientImpl::GetServiceId() const
+  {
+    Registration::SServiceMethodId service_id;
+
+    service_id.service_id.entity_id = m_client_id;
+    service_id.service_id.entity_id = Process::GetProcessID();
+    service_id.service_id.host_name = Process::GetHostName();
+
+    service_id.service_name = m_service_name;
+    service_id.method_name  = "";
+
+    return service_id;
+  }
+
   std::string CServiceClientImpl::GetServiceName() const
   {
     return m_service_name;

diff --git a/ecal/core/src/service/ecal_service_client_impl.h b/ecal/core/src/service/ecal_service_client_impl.h
@@ -78,6 +78,9 @@ namespace eCAL
     // Called by the registration provider to get a registration sample
     Registration::Sample GetRegistration();
 
+    // Retrieves the service id
+    Registration::SServiceMethodId GetServiceId() const;
+
     // Retrieves the service name
     std::string GetServiceName() const;
 

diff --git a/ecal/core/src/service/ecal_service_server.cpp b/ecal/core/src/service/ecal_service_server.cpp
@@ -82,8 +82,8 @@ namespace eCAL
 
   Registration::SServiceMethodId CServiceServer::GetServiceId() const
   {
-    // TODO: Implement this
-    return Registration::SServiceMethodId();
+    if (m_service_server_impl == nullptr) return Registration::SServiceMethodId();
+    return m_service_server_impl->GetServiceId();
   }
 
   bool CServiceServer::IsConnected()

diff --git a/ecal/core/src/service/ecal_service_server_impl.cpp b/ecal/core/src/service/ecal_service_server_impl.cpp
@@ -152,6 +152,20 @@ namespace eCAL
     return GetRegistrationSample();
   }
 
+  Registration::SServiceMethodId CServiceServerImpl::GetServiceId() const
+  {
+    Registration::SServiceMethodId service_id;
+
+    service_id.service_id.entity_id = m_service_id;
+    service_id.service_id.entity_id = Process::GetProcessID();
+    service_id.service_id.host_name = Process::GetHostName();
+
+    service_id.service_name = m_service_name;
+    service_id.method_name  = "";
+
+    return service_id;
+  }
+
   std::string CServiceServerImpl::GetServiceName() const
   {
     return m_service_name;

diff --git a/ecal/core/src/service/ecal_service_server_impl.h b/ecal/core/src/service/ecal_service_server_impl.h
@@ -67,6 +67,9 @@ namespace eCAL
     // Called by the registration provider to get a registration sample
     Registration::Sample GetRegistration();
 
+    // Retrieves the service id
+    Registration::SServiceMethodId GetServiceId() const;
+
     // Retrieves the service name
     std::string GetServiceName() const;