Merge branch 'main' into feature/split_AttMtuExchange_interface

Author: XavierBernhardt-Philips

services/ble/GattServer.hpp

@@ -40,6 +40,7 @@ namespace services
 
         virtual AttAttribute::Handle ServiceHandle() const = 0;
         virtual AttAttribute::Handle CharacteristicHandle() const = 0;
+        virtual AttAttribute::Handle CharacteristicValueHandle() const = 0;
     };
 
     class GattServerCharacteristicOperations

services/ble/GattServerCharacteristicImpl.cpp

@@ -42,6 +42,11 @@ namespace services
         return handle;
     }
 
+    AttAttribute::Handle GattServerCharacteristicImpl::CharacteristicValueHandle() const
+    {
+        return valueHandle;
+    }
+
     void GattServerCharacteristicImpl::UpdateValue()
     {
         auto status = GattServerCharacteristicOperationsObserver::Subject().Update(*this, updateContext->data);

services/ble/GattServerCharacteristicImpl.hpp

@@ -22,6 +22,7 @@ namespace services
         // Implementation of GattServerCharacteristicOperationsObserver
         AttAttribute::Handle ServiceHandle() const override;
         AttAttribute::Handle CharacteristicHandle() const override;
+        AttAttribute::Handle CharacteristicValueHandle() const override;
 
     private:
         struct UpdateContext

services/ble/test/TestGattServer.cpp

@@ -22,9 +22,11 @@ TEST(GattServerTest, characteristic_implementation_handles_are_accesible)
     s.Handle() = 0xAB;
     services::GattServerCharacteristicImpl c{ s, uuid16, valueSize };
     c.Handle() = 0xCD;
+    c.ValueHandle() = 0xEF;
 
     EXPECT_EQ(0xAB, c.ServiceHandle());
     EXPECT_EQ(0xCD, c.CharacteristicHandle());
+    EXPECT_EQ(0xEF, c.CharacteristicValueHandle());
 }
 
 TEST(GattServerTest, characteristic_implementation_supports_different_uuid_lengths)

services/ble/test_doubles/GattServerMock.hpp

@@ -35,6 +35,7 @@ namespace services
     public:
         MOCK_METHOD(AttAttribute::Handle, ServiceHandle, (), (const));
         MOCK_METHOD(AttAttribute::Handle, CharacteristicHandle, (), (const));
+        MOCK_METHOD(AttAttribute::Handle, CharacteristicValueHandle, (), (const));
         MOCK_METHOD(void, Update, (infra::ConstByteRange data, infra::Function<void()> onDone));
     };
 }

services/echo_console/Console.cpp

@@ -757,6 +757,11 @@ namespace application
 
             The method call in echo console for value="{ "bool":true }" would be:
                 Method "{ \"bool\":true }"
+
+        Best practice: To avoid ambiguity when multiple services have methods with the same name, prefix the method with the service name.
+            For example, if both GapCentral and GapPeripheral in Gap.proto have a RemoveAllBonds method, call the GapCentral version as:
+                GapCentral.RemoveAllBonds
+
         5. Primitive types mapping table:
             +-----------------+-----------------+-------------------------------------+
             | Proto Type      | Token Type      | Example Input                       |
@@ -923,6 +928,19 @@ namespace application
         {
             services::GlobalTracer().Trace() << "Incorrect type at index " << error.index << " expected type " << error.correctType << " (contents after that position is " << line.substr(error.index) << ")\n";
         }
+        catch (ConsoleExceptions::AmbiguousMethod& error)
+        {
+            services::GlobalTracer().Trace() << "Ambiguous method call: '" << error.methodName << "' exists in multiple services: ";
+
+            for (const auto& serviceName : error.serviceNames)
+            {
+                if (&serviceName != &error.serviceNames.front())
+                    services::GlobalTracer().Continue() << ", ";
+                services::GlobalTracer().Continue() << serviceName;
+            }
+
+            services::GlobalTracer().Continue() << "\nPlease specify the service name, e.g., " << error.serviceNames.front() << "." << error.methodName << "\n";
+        }
         catch (ConsoleExceptions::MethodNotFound& error)
         {
             services::GlobalTracer().Trace() << "Method ";
@@ -940,15 +958,29 @@ namespace application
 
     std::pair<std::shared_ptr<const EchoService>, const EchoMethod&> Console::SearchMethod(MethodInvocation& methodInvocation) const
     {
+        std::vector<std::pair<std::shared_ptr<const EchoService>, const EchoMethod*>> matchingMethods;
+
         for (auto service : root.services)
         {
             if (methodInvocation.method.size() == 1 || methodInvocation.method.front() == service->name)
                 for (auto& method : service->methods)
                     if (method.name == methodInvocation.method.back())
-                        return std::pair<std::shared_ptr<const EchoService>, const EchoMethod&>(service, method);
+                        matchingMethods.emplace_back(std::make_pair(service, &method));
+        }
+
+        if (matchingMethods.empty())
+            throw ConsoleExceptions::MethodNotFound{ methodInvocation.method };
+
+        if (methodInvocation.method.size() == 1 && matchingMethods.size() > 1)
+        {
+            std::vector<std::string> serviceNames;
+            for (const auto& [echoService, echoMethod] : matchingMethods)
+                serviceNames.push_back(echoService->name);
+
+            throw ConsoleExceptions::AmbiguousMethod{ methodInvocation.method.back(), serviceNames };
         }
 
-        throw ConsoleExceptions::MethodNotFound{ methodInvocation.method };
+        return std::pair<std::shared_ptr<const EchoService>, const EchoMethod&>(matchingMethods[0].first, *matchingMethods[0].second);
     }
 
     Console::MethodInvocation::MethodInvocation(const std::string& line)

services/echo_console/Console.hpp

@@ -274,6 +274,12 @@ namespace application
             std::vector<std::string> method;
         };
 
+        struct AmbiguousMethod
+        {
+            std::string methodName;
+            std::vector<std::string> serviceNames;
+        };
+
         struct SyntaxError
         {
             std::size_t index;

services/network_instantiations/ConnectionBsd.cpp

@@ -32,7 +32,7 @@ namespace services
 
     ConnectionBsd::~ConnectionBsd()
     {
-        if (socket != 0)
+        if (Connected())
         {
             int result = close(socket);
             if (result == -1)
@@ -94,6 +94,11 @@ namespace services
         Attach(connectionObserver);
     }
 
+    bool ConnectionBsd::Connected() const
+    {
+        return socket != 0;
+    }
+
     void ConnectionBsd::Receive()
     {
         while (!receiveBuffer.full())
@@ -103,7 +108,7 @@ namespace services
             if (received == -1)
             {
                 if (errno != EWOULDBLOCK)
-                    ResetOwnership();
+                    AbortAndDestroy();
                 return;
             }
             else if (received != 0)
@@ -118,7 +123,7 @@ namespace services
             }
             else
             {
-                ResetOwnership();
+                CloseAndDestroy();
                 return;
             }
         }
@@ -163,7 +168,8 @@ namespace services
 
     void ConnectionBsd::ResetOwnership()
     {
-        Detach();
+        if (IsAttached())
+            Detach();
         self = nullptr;
     }
 

services/network_instantiations/ConnectionBsd.hpp

@@ -31,6 +31,7 @@ namespace services
 
         IPv4Address Ipv4Address() const;
         void SetObserver(infra::SharedPtr<services::ConnectionObserver> connectionObserver);
+        bool Connected() const;
 
         void Receive();
         void Send();

services/network_instantiations/ConnectionWin.cpp

@@ -82,6 +82,11 @@ namespace services
         Attach(connectionObserver);
     }
 
+    bool ConnectionWin::Connected() const
+    {
+        return socket != 0;
+    }
+
     void ConnectionWin::Receive()
     {
         while (!receiveBuffer.full())
@@ -91,7 +96,7 @@ namespace services
             if (received == SOCKET_ERROR)
             {
                 if (WSAGetLastError() != WSAEWOULDBLOCK)
-                    ResetOwnership();
+                    AbortAndDestroy();
                 return;
             }
             else if (received != 0)
@@ -107,7 +112,7 @@ namespace services
             }
             else
             {
-                ResetOwnership();
+                CloseAndDestroy();
                 return;
             }
         }
@@ -126,7 +131,7 @@ namespace services
             if (sent == SOCKET_ERROR)
             {
                 if (WSAGetLastError() != WSAEWOULDBLOCK)
-                    ResetOwnership();
+                    AbortAndDestroy();
                 return;
             }