Merge pull request #247 from ByteXiaoTang/master

fix for issue #239 #241 #223 

3 files changed, 4 insertions, 2 deletions

diff --git a/implementation/endpoints/src/server_endpoint_impl.cpp b/implementation/endpoints/src/server_endpoint_impl.cpp
index 4a46ed8..46e2397 100644
--- a/implementation/endpoints/src/server_endpoint_impl.cpp
+++ b/implementation/endpoints/src/server_endpoint_impl.cpp
@@ -632,6 +632,7 @@ void server_endpoint_impl<Protocol>::send_cbk(
             }
             if (found_service_msg) {
                 ++stp_hndlr_iter;
+                found_service_msg = false;
             } else { // all messages of the to be stopped service have been sent
                 auto handler = stp_hndlr_iter->second;
                 auto ptr = this->shared_from_this();
diff --git a/implementation/routing/src/routing_manager_proxy.cpp b/implementation/routing/src/routing_manager_proxy.cpp
index 3eba2a5..2af0eb5 100644
--- a/implementation/routing/src/routing_manager_proxy.cpp
+++ b/implementation/routing/src/routing_manager_proxy.cpp
@@ -154,6 +154,7 @@ bool routing_manager_proxy::offer_service(client_t _client,
     if(!routing_manager_base::offer_service(_client, _service, _instance, _major, _minor)) {
         VSOMEIP_WARNING << "routing_manager_proxy::offer_service,"
                 << "routing_manager_base::offer_service returned false";
+        return false;
     }
     {
         std::lock_guard<std::mutex> its_lock(state_mutex_);
diff --git a/implementation/service_discovery/src/service_discovery_impl.cpp b/implementation/service_discovery/src/service_discovery_impl.cpp
index b252e62..16f0fad 100644
--- a/implementation/service_discovery/src/service_discovery_impl.cpp
+++ b/implementation/service_discovery/src/service_discovery_impl.cpp
@@ -2610,11 +2610,11 @@ service_discovery_impl::check_ipv4_address(
     //Check unallowed ipv4 address
     bool is_valid = true;
 
-    static const boost::asio::ip::address_v4::bytes_type its_unicast_address =
+    const boost::asio::ip::address_v4::bytes_type its_unicast_address =
             unicast_.to_v4().to_bytes();
     const boost::asio::ip::address_v4::bytes_type endpoint_address =
             its_address.to_v4().to_bytes();
-    static const boost::asio::ip::address_v4::bytes_type its_netmask =
+    const boost::asio::ip::address_v4::bytes_type its_netmask =
             configuration_->get_netmask().to_v4().to_bytes();
 
     //same address as unicast address of DUT not allowed