diff options
5 files changed, 7 insertions, 7 deletions
diff --git a/implementation/endpoints/src/client_endpoint_impl.cpp b/implementation/endpoints/src/client_endpoint_impl.cpp index 434ed14..9b31cc1 100644 --- a/implementation/endpoints/src/client_endpoint_impl.cpp +++ b/implementation/endpoints/src/client_endpoint_impl.cpp @@ -612,7 +612,7 @@ typename endpoint_impl<Protocol>::cms_ret_e client_endpoint_impl<Protocol>::chec return endpoint_impl<Protocol>::cms_ret_e::MSG_WAS_SPLIT; } } - VSOMEIP_ERROR << "cei::check_message_size: Dropping to big message (" + VSOMEIP_ERROR << "cei::check_message_size: Dropping too big message (" << std::dec << _size << " Bytes). Maximum allowed message size is: " << endpoint_impl<Protocol>::max_message_size_ << " Bytes."; ret = endpoint_impl<Protocol>::cms_ret_e::MSG_TOO_BIG; diff --git a/implementation/endpoints/src/server_endpoint_impl.cpp b/implementation/endpoints/src/server_endpoint_impl.cpp index 90aea96..46e2397 100644 --- a/implementation/endpoints/src/server_endpoint_impl.cpp +++ b/implementation/endpoints/src/server_endpoint_impl.cpp @@ -466,7 +466,7 @@ typename endpoint_impl<Protocol>::cms_ret_e server_endpoint_impl<Protocol>::chec return endpoint_impl<Protocol>::cms_ret_e::MSG_WAS_SPLIT; } } - VSOMEIP_ERROR << "sei::send_intern: Dropping to big message (" << _size + VSOMEIP_ERROR << "sei::send_intern: Dropping too big message (" << _size << " Bytes). Maximum allowed message size is: " << endpoint_impl<Protocol>::max_message_size_ << " Bytes."; ret = endpoint_impl<Protocol>::cms_ret_e::MSG_TOO_BIG; @@ -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 8ee1539..5075cf1 100644 --- a/implementation/service_discovery/src/service_discovery_impl.cpp +++ b/implementation/service_discovery/src/service_discovery_impl.cpp @@ -2605,11 +2605,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 diff --git a/implementation/utility/include/utility.hpp b/implementation/utility/include/utility.hpp index db54eb9..434ef11 100644 --- a/implementation/utility/include/utility.hpp +++ b/implementation/utility/include/utility.hpp @@ -36,9 +36,7 @@ public: } static inline bool is_request(message_type_e _type) { - return ((_type < message_type_e::MT_NOTIFICATION) - || (_type >= message_type_e::MT_REQUEST_ACK - && _type <= message_type_e::MT_REQUEST_NO_RETURN_ACK)); + return (_type < message_type_e::MT_NOTIFICATION); } static inline bool is_request_no_return(std::shared_ptr<message> _message) { |