CommonAPI-SomeIP 3.1.10.4

COVESA · Dec 12, 2016 · fba3007 · fba3007
1 parent 13bd21b
commit fba3007
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,10 @@
 Changes
 =======
+
+v3.1.10.4
+- Fixed crash (double free) on destruction of static objects
+- Fixed availability issues in verification tests
+
 v3.1.10.3
 - Fixed subscription counter handling
 

diff --git a/include/CommonAPI/SomeIP/Connection.hpp b/include/CommonAPI/SomeIP/Connection.hpp
@@ -324,6 +324,9 @@ class Connection:
             std::map<eventgroup_id_t,
                 std::map<ProxyConnection::EventHandler* ,
                     std::pair<std::weak_ptr<ProxyConnection::EventHandler>, std::set<uint32_t>>>>>> pendingSelectiveErrorHandlers_;
+
+    std::mutex availabilityCalledMutex_;
+    std::map<service_id_t, std::map<instance_id_t, bool>> availabilityCalled_;
 };
 
 

diff --git a/src/CommonAPI/SomeIP/Connection.cpp b/src/CommonAPI/SomeIP/Connection.cpp
@@ -160,6 +160,10 @@ void Connection::onConnectionEvent(state_type_e state) {
 
 void Connection::onAvailabilityChange(service_id_t _service, instance_id_t _instance,
            bool _is_available) {
+    {
+        std::lock_guard<std::mutex> itsLock(availabilityCalledMutex_);
+        availabilityCalled_[_service][_instance] = true;
+    }
     if (auto lockedContext = mainLoopContext_.lock()) {
         std::shared_ptr<AvblQueueEntry> avbl_queue_entry = std::make_shared<AvblQueueEntry>(_service, _instance, _is_available);
         watch_->pushQueue(avbl_queue_entry);
@@ -620,6 +624,26 @@ void Connection::addSelectiveErrorListener(service_id_t serviceId,
 
 bool
 Connection::isAvailable(const Address &_address) {
+    {
+        std::lock_guard<std::mutex> itsLock(connectionMutex_);
+        if (connectionStatus_ != state_type_e::ST_REGISTERED) {
+            return false;
+        }
+    }
+    {
+        bool availabilityCalled(false);
+        std::lock_guard<std::mutex> itsLock(availabilityCalledMutex_);
+        auto its_service = availabilityCalled_.find(_address.getService());
+        if (its_service != availabilityCalled_.end()) {
+            auto its_instance = its_service->second.find(_address.getInstance());
+            if (its_instance != its_service->second.end()) {
+                availabilityCalled = its_instance->second;
+            }
+        }
+        if (!availabilityCalled) {
+            return false;
+        }
+    }
     return application_->is_available(_address.getService(), _address.getInstance(),
             _address.getMajorVersion(), _address.getMinorVersion());
 }

diff --git a/src/CommonAPI/SomeIP/Factory.cpp b/src/CommonAPI/SomeIP/Factory.cpp
@@ -15,12 +15,17 @@
 namespace CommonAPI {
 namespace SomeIP {
 
+static std::weak_ptr<CommonAPI::Runtime> runtime__;
+
 INITIALIZER(FactoryInit) {
+    runtime__ = Runtime::get();
     Runtime::get()->registerFactory("someip", Factory::get());
 }
 
 DEINITIALIZER(FactoryDeinit) {
-    Runtime::get()->unregisterFactory("someip");
+    if (auto rt = runtime__.lock()) {
+        rt->unregisterFactory("someip");
+    }
 }
 
 std::shared_ptr<Factory>