diff options
| author | Jürgen Gehring <Juergen.Gehring@bmw.de> | 2016-10-11 05:20:33 -0700 |
|---|---|---|
| committer | Jürgen Gehring <Juergen.Gehring@bmw.de> | 2016-10-11 05:20:33 -0700 |
| commit | 1375432503c0a72df7ad5c793c3e1f04e6b9e730 (patch) | |
| tree | 4b229a9c5a7767db69db015f8e92e01c64614bf0 /tools | |
| parent | 273814c76be4a8f906dc053492529b8d53b9e807 (diff) | |
| download | vSomeIP-1375432503c0a72df7ad5c793c3e1f04e6b9e730.tar.gz | |
vsomeip 2.4.22.4.2
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/vsomeip_ctrl.cpp | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/tools/vsomeip_ctrl.cpp b/tools/vsomeip_ctrl.cpp index 84faf00..947caf8 100644 --- a/tools/vsomeip_ctrl.cpp +++ b/tools/vsomeip_ctrl.cpp @@ -5,7 +5,7 @@ #include <vsomeip/vsomeip.hpp> #include "../implementation/configuration/include/internal.hpp" -#include "../../implementation/logging/include/logger.hpp" +#include "../implementation/logging/include/logger.hpp" #include "../implementation/service_discovery/include/constants.hpp" #include "../implementation/utility/include/byteorder.hpp" @@ -91,7 +91,7 @@ public: "registered." : "deregistered."); if (_state == vsomeip::state_type_e::ST_REGISTERED) { - app_->request_service(service_id_, vsomeip::ANY_INSTANCE); + app_->request_service(service_id_, instance_); } } @@ -112,23 +112,25 @@ public: << "." << std::setw(4) << std::setfill('0') << std::hex << _response->get_instance() << "]:"; VSOMEIP_INFO << "########## begin message"; - VSOMEIP_INFO << std::setw(4) << std::setfill('0') << std::hex - << _response->get_service() << std::setw(4) << std::setfill('0') - << std::hex << _response->get_method() + VSOMEIP_INFO << std::hex << std::setw(4) << std::setfill('0') + << _response->get_service() + << std::hex << std::setw(4) << std::setfill('0') + << _response->get_method() << " # service id / instance id"; - VSOMEIP_INFO << std::setw(8) << std::setfill('0') << std::hex + VSOMEIP_INFO << std::hex << std::setw(8) << std::setfill('0') << _response->get_length() << " # length"; - VSOMEIP_INFO << std::setw(4) << std::setfill('0') << std::hex - << _response->get_client() << std::setw(4) << std::setfill('0') - << std::hex << _response->get_session() + VSOMEIP_INFO << std::hex << std::setw(4) << std::setfill('0') + << _response->get_client() + << std::hex << std::setw(4) << std::setfill('0') + << _response->get_session() << " # client id / session id"; - VSOMEIP_INFO << std::setw(2) << std::setfill('0') << std::hex + VSOMEIP_INFO << std::hex << std::setw(2) << std::setfill('0') << static_cast<std::uint16_t>(_response->get_protocol_version()) - << std::setw(2) << std::setfill('0') << std::hex + << std::hex << std::setw(2) << std::setfill('0') << static_cast<std::uint16_t>(_response->get_interface_version()) - << std::setw(2) << std::setfill('0') << std::hex + << std::hex << std::setw(2) << std::setfill('0') << static_cast<std::uint16_t>(_response->get_message_type()) - << std::setw(2) << std::setfill('0') << std::hex + << std::hex << std::setw(2) << std::setfill('0') << static_cast<std::uint16_t>(_response->get_return_code()) << " # protocol version / interface version / " << "message type / return code"; |