Client does not go back to initial Wait Phase when offer service TTL expires

implementation/routing/src/routing_manager_impl.cpp

@@ -2324,6 +2324,8 @@ void routing_manager_impl::update_routing_info(std::chrono::milliseconds _elapse
         for (const auto& i : s.second) {
             if (discovery_) {
                 discovery_->unsubscribe_all(s.first, i);
+                // go to Initial Wait Phase
+                discovery_->reset_request_sent_counter(s.first, i);
             }
             del_routing_info(s.first, i, true, true, true);
             VSOMEIP_INFO << "update_routing_info: elapsed=" << _elapsed.count() << " : delete service/instance " << std::hex

implementation/service_discovery/include/service_discovery.hpp

@@ -40,6 +40,7 @@ class service_discovery {
     virtual void unsubscribe(service_t _service, instance_t _instance, eventgroup_t _eventgroup, client_t _client) = 0;
     virtual void unsubscribe_all(service_t _service, instance_t _instance) = 0;
     virtual void unsubscribe_all_on_suspend() = 0;
+    virtual void reset_request_sent_counter(service_t _service, instance_t _instance) = 0;
 
     virtual bool send(bool _is_announcing) = 0;
 

implementation/service_discovery/include/service_discovery_impl.hpp

@@ -73,6 +73,7 @@ class service_discovery_impl : public service_discovery, public std::enable_shar
     void unsubscribe_all(service_t _service, instance_t _instance);
     void unsubscribe_all_on_suspend();
     void remove_subscriptions(service_t _service, instance_t _instance);
+    void reset_request_sent_counter(service_t _service, instance_t _instance);
 
     bool send(bool _is_announcing);
 

implementation/service_discovery/src/service_discovery_impl.cpp

@@ -205,6 +205,17 @@ void service_discovery_impl::release_service(service_t _service, instance_t _ins
     }
 }
 
+void service_discovery_impl::reset_request_sent_counter(service_t _service, instance_t _instance) {
+    std::scoped_lock its_lock {requested_mutex_};
+    auto find_service = requested_.find(_service);
+    if (find_service != requested_.end()) {
+        auto find_instance = find_service->second.find(_instance);
+        if (find_instance != find_service->second.end()) {
+            find_instance->second->set_sent_counter(0);
+        }
+    }
+}
+
 void service_discovery_impl::update_request(service_t _service, instance_t _instance) {
     std::lock_guard<std::mutex> its_lock(requested_mutex_);
     auto find_service = requested_.find(_service);