diff options
author | Juergen Gehring <juergen.gehring@bmw.de> | 2018-01-25 00:40:06 -0800 |
---|---|---|
committer | Juergen Gehring <juergen.gehring@bmw.de> | 2018-01-25 00:40:06 -0800 |
commit | 005f77c5d4711ece8ad5e5e789c78f90c41d928b (patch) | |
tree | 319b36e698673ecd4ecc1b17aa075f9188d5bd90 | |
parent | d04934f62eae198242d55298a9bc0365b0d7ec64 (diff) | |
download | vSomeIP-005f77c5d4711ece8ad5e5e789c78f90c41d928b.tar.gz |
vsomeip 2.10.32.10.3
-rw-r--r-- | CHANGES | 5 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | implementation/service_discovery/src/service_discovery_impl.cpp | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -1,6 +1,11 @@ Changes ======= +v2.10.3 +- Interpret all incoming TTLs five times longer in service discovery + to prevent inadvertent expiration of remote offers during high load + situations. + v2.10.2 - Fix deadlock in routing manager when processing subscription acknowledgment from a local client if the corresponding service diff --git a/CMakeLists.txt b/CMakeLists.txt index 2fd0022..5d958b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ project (vsomeip) set (VSOMEIP_MAJOR_VERSION 2) set (VSOMEIP_MINOR_VERSION 10) -set (VSOMEIP_PATCH_VERSION 2) +set (VSOMEIP_PATCH_VERSION 3) set (VSOMEIP_VERSION ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP_PATCH_VERSION}) set (PACKAGE_VERSION ${VSOMEIP_VERSION}) # Used in documentatin/doxygen.in set (CMAKE_VERBOSE_MAKEFILE off) diff --git a/implementation/service_discovery/src/service_discovery_impl.cpp b/implementation/service_discovery/src/service_discovery_impl.cpp index 903afd6..e25ca5b 100644 --- a/implementation/service_discovery/src/service_discovery_impl.cpp +++ b/implementation/service_discovery/src/service_discovery_impl.cpp @@ -1358,7 +1358,7 @@ void service_discovery_impl::process_offerservice_serviceentry( } host_->add_routing_info(_service, _instance, - _major, _minor, _ttl, + _major, _minor, _ttl * 5, _reliable_address, _reliable_port, _unreliable_address, _unreliable_port); @@ -2172,7 +2172,7 @@ void service_discovery_impl::handle_eventgroup_subscription(service_t _service, client_t its_subscribing_remote_client = VSOMEIP_ROUTING_CLIENT; switch (host_->on_remote_subscription(_service, _instance, _eventgroup, target.subscriber_, target.target_, - _ttl, &its_subscribing_remote_client, + _ttl * 5, &its_subscribing_remote_client, _message_id)) { case remote_subscription_state_e::SUBSCRIPTION_ACKED: insert_subscription_ack(its_message, _service, @@ -3182,7 +3182,7 @@ void service_discovery_impl::update_subscription_expiration_timer( if (entry->get_type() == entry_type_e::SUBSCRIBE_EVENTGROUP_ACK && entry->get_ttl()) { const std::chrono::steady_clock::time_point its_expiration = now - + std::chrono::seconds(entry->get_ttl()); + + std::chrono::seconds(entry->get_ttl() * 5); if (its_expiration < next_subscription_expiration_) { next_subscription_expiration_ = its_expiration; } |