summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Gehring <juergen.gehring@bmw.de>2018-05-22 02:56:42 -0700
committerJuergen Gehring <juergen.gehring@bmw.de>2018-05-22 02:56:42 -0700
commit0bfa45d965aa89f84b57970396c97209980e6b80 (patch)
treef5dcd7e7368f11e05617ef2f8f0253189550fe56
parent3aec01c41c77f4b6f36134273f50cfb23ab87afb (diff)
downloadvSomeIP-0bfa45d965aa89f84b57970396c97209980e6b80.tar.gz
vsomeip 2.10.13
-rw-r--r--CHANGES1
-rw-r--r--CMakeLists.txt2
-rw-r--r--implementation/routing/src/routing_manager_impl.cpp6
3 files changed, 4 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 9716e38..822a21c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
Changes
=======
+v2.10.13
v2.10.12
- Fix exception handling for boost logger
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d327d7..c0d8f48 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 12)
+set (VSOMEIP_PATCH_VERSION 13)
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/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp
index 6f4fd14..7efcfa3 100644
--- a/implementation/routing/src/routing_manager_impl.cpp
+++ b/implementation/routing/src/routing_manager_impl.cpp
@@ -1944,6 +1944,7 @@ std::shared_ptr<endpoint> routing_manager_impl::create_remote_client(
if( its_remote_port != ILLEGAL_PORT) {
// if client port range for remote service port range is configured
// and remote port is in range, determine unused client port
+ std::lock_guard<std::mutex> its_lock(used_client_ports_mutex_);
if (configuration_->get_client_port(_service, _instance, its_remote_port, _reliable,
used_client_ports_, its_local_port)) {
if(its_endpoint_def) {
@@ -1956,10 +1957,7 @@ std::shared_ptr<endpoint> routing_manager_impl::create_remote_client(
}
if (its_endpoint) {
- {
- std::lock_guard<std::mutex> its_lock(used_client_ports_mutex_);
- used_client_ports_[_reliable].insert(its_local_port);
- }
+ used_client_ports_[_reliable].insert(its_local_port);
service_instances_[_service][its_endpoint.get()] = _instance;
remote_services_[_service][_instance][_client][_reliable] = its_endpoint;
if (_client == VSOMEIP_ROUTING_CLIENT) {