summaryrefslogtreecommitdiff
path: root/implementation/message/src
diff options
context:
space:
mode:
Diffstat (limited to 'implementation/message/src')
-rw-r--r--implementation/message/src/deserializer.cpp472
-rw-r--r--implementation/message/src/message_base_impl.cpp253
-rw-r--r--implementation/message/src/message_header_impl.cpp160
-rw-r--r--implementation/message/src/message_impl.cpp134
-rw-r--r--implementation/message/src/payload_impl.cpp158
-rw-r--r--implementation/message/src/serializer.cpp244
6 files changed, 724 insertions, 697 deletions
diff --git a/implementation/message/src/deserializer.cpp b/implementation/message/src/deserializer.cpp
index b416199..c7464cb 100644
--- a/implementation/message/src/deserializer.cpp
+++ b/implementation/message/src/deserializer.cpp
@@ -1,235 +1,237 @@
-// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <cstring>
-
-#ifdef VSOMEIP_DEBUGGING
-#include <iomanip>
-#include <sstream>
-#endif
-
-#include "../include/message_impl.hpp"
-#include "../include/deserializer.hpp"
-#include "../../logging/include/logger.hpp"
-#include "../../utility/include/byteorder.hpp"
-
-namespace vsomeip {
-
-deserializer::deserializer(std::uint32_t _buffer_shrink_threshold)
- : position_(data_.begin()),
- remaining_(0),
- buffer_shrink_threshold_(_buffer_shrink_threshold),
- shrink_count_(0) {
-}
-
-deserializer::deserializer(byte_t *_data, std::size_t _length,
- std::uint32_t _buffer_shrink_threshold)
- : data_(_data, _data + _length),
- position_(data_.begin()),
- remaining_(_length),
- buffer_shrink_threshold_(_buffer_shrink_threshold),
- shrink_count_(0) {
-}
-
-deserializer::deserializer(const deserializer &_other)
- : data_(_other.data_),
- position_(_other.position_),
- remaining_(_other.remaining_),
- buffer_shrink_threshold_(_other.buffer_shrink_threshold_),
- shrink_count_(_other.shrink_count_) {
-}
-
-deserializer::~deserializer() {
-}
-
-std::size_t deserializer::get_available() const {
- return data_.size();
-}
-
-std::size_t deserializer::get_remaining() const {
- return remaining_;
-}
-
-void deserializer::set_remaining(std::size_t _remaining) {
- remaining_ = _remaining;
-}
-
-bool deserializer::deserialize(uint8_t& _value) {
- if (0 == remaining_)
- return false;
-
- _value = *position_++;
-
- remaining_--;
- return true;
-}
-
-bool deserializer::deserialize(uint16_t& _value) {
- if (2 > remaining_)
- return false;
-
- uint8_t byte0, byte1;
- byte0 = *position_++;
- byte1 = *position_++;
- remaining_ -= 2;
-
- _value = VSOMEIP_BYTES_TO_WORD(byte0, byte1);
-
- return true;
-}
-
-bool deserializer::deserialize(uint32_t &_value, bool _omit_last_byte) {
- if (3 > remaining_ || (!_omit_last_byte && 4 > remaining_))
- return false;
-
- uint8_t byte0 = 0, byte1, byte2, byte3;
- if (!_omit_last_byte) {
- byte0 = *position_++;
- remaining_--;
- }
- byte1 = *position_++;
- byte2 = *position_++;
- byte3 = *position_++;
- remaining_ -= 3;
-
- _value = VSOMEIP_BYTES_TO_LONG(
- byte0, byte1, byte2, byte3);
-
- return true;
-}
-
-bool deserializer::deserialize(uint8_t *_data, std::size_t _length) {
- if (_length > remaining_)
- return false;
-
- std::memcpy(_data, &data_[position_ - data_.begin()], _length);
- position_ += _length;
- remaining_ -= _length;
-
- return true;
-}
-
-bool deserializer::deserialize(std::string& _target, std::size_t _length) {
- if (_length > remaining_ || _length > _target.capacity()) {
- return false;
- }
- _target.assign(position_, position_ + _length);
- position_ += _length;
- remaining_ -= _length;
-
- return true;
-}
-
-bool deserializer::deserialize(std::vector< uint8_t >& _value) {
- if (_value.capacity() > remaining_)
- return false;
-
- _value.assign(position_, position_ + _value.capacity());
- position_ += _value.capacity();
- remaining_ -= _value.capacity();
-
- return true;
-}
-
-bool deserializer::look_ahead(std::size_t _index, uint8_t &_value) const {
- if (_index >= data_.size())
- return false;
-
- _value = *(position_ + _index);
-
- return true;
-}
-
-bool deserializer::look_ahead(std::size_t _index, uint16_t &_value) const {
- if (_index+1 >= data_.size())
- return false;
-
- std::vector< uint8_t >::iterator i = position_ + _index;
- _value = VSOMEIP_BYTES_TO_WORD(*i, *(i+1));
-
- return true;
-}
-
-bool deserializer::look_ahead(std::size_t _index, uint32_t &_value) const {
- if (_index+3 >= data_.size())
- return false;
-
- std::vector< uint8_t >::const_iterator i = position_ + _index;
- _value = VSOMEIP_BYTES_TO_LONG(*i, *(i+1), *(i+2), *(i+3));
-
- return true;
-}
-
-message * deserializer::deserialize_message() {
- message_impl* deserialized_message = new message_impl;
- if (0 != deserialized_message) {
- if (false == deserialized_message->deserialize(this)) {
- VSOMEIP_ERROR << "SOME/IP message deserialization failed!";
- delete deserialized_message;
- deserialized_message = nullptr;
- }
- }
-
- return deserialized_message;
-}
-
-void deserializer::set_data(const byte_t *_data, std::size_t _length) {
- if (0 != _data) {
- data_.assign(_data, _data + _length);
- position_ = data_.begin();
- remaining_ = data_.end() - position_;
- } else {
- data_.clear();
- position_ = data_.end();
- remaining_ = 0;
- }
-}
-
-void deserializer::append_data(const byte_t *_data, std::size_t _length) {
- std::size_t offset = (position_ - data_.begin());
- data_.insert(data_.end(), _data, _data + _length);
- position_ = data_.begin() + offset;
- remaining_ += _length;
-}
-
-void deserializer::drop_data(std::size_t _length) {
- if (position_ + _length < data_.end())
- position_ += _length;
- else
- position_ = data_.end();
-}
-
-void deserializer::reset() {
- if (buffer_shrink_threshold_) {
- if (data_.size() < (data_.capacity() >> 1)) {
- shrink_count_++;
- } else {
- shrink_count_ = 0;
- }
- }
- data_.clear();
- position_ = data_.begin();
- remaining_ = data_.size();
- if (buffer_shrink_threshold_ && shrink_count_ > buffer_shrink_threshold_) {
- data_.shrink_to_fit();
- shrink_count_ = 0;
- }
-}
-
-#ifdef VSOMEIP_DEBUGGING
-void deserializer::show() const {
- std::stringstream its_message;
- its_message << "("
- << std::hex << std::setw(2) << std::setfill('0')
- << (int)*position_ << ", "
- << std:: dec << remaining_ << ") ";
- for (int i = 0; i < data_.size(); ++i)
- its_message << std::hex << std::setw(2) << std::setfill('0')
- << (int)data_[i] << " ";
- VSOMEIP_INFO << its_message;
-}
-#endif
-
-} // namespace vsomeip
+// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include <cstring>
+
+#ifdef VSOMEIP_DEBUGGING
+#include <iomanip>
+#include <sstream>
+#endif
+#include <vsomeip/internal/logger.hpp>
+
+#include "../include/message_impl.hpp"
+#include "../include/deserializer.hpp"
+#include "../../utility/include/byteorder.hpp"
+
+namespace vsomeip_v3 {
+
+deserializer::deserializer(std::uint32_t _buffer_shrink_threshold)
+ : position_(data_.begin()),
+ remaining_(0),
+ buffer_shrink_threshold_(_buffer_shrink_threshold),
+ shrink_count_(0) {
+}
+
+deserializer::deserializer(byte_t *_data, std::size_t _length,
+ std::uint32_t _buffer_shrink_threshold)
+ : data_(_data, _data + _length),
+ position_(data_.begin()),
+ remaining_(_length),
+ buffer_shrink_threshold_(_buffer_shrink_threshold),
+ shrink_count_(0) {
+}
+
+deserializer::deserializer(const deserializer &_other)
+ : data_(_other.data_),
+ position_(_other.position_),
+ remaining_(_other.remaining_),
+ buffer_shrink_threshold_(_other.buffer_shrink_threshold_),
+ shrink_count_(_other.shrink_count_) {
+}
+
+deserializer::~deserializer() {
+}
+
+std::size_t deserializer::get_available() const {
+ return data_.size();
+}
+
+std::size_t deserializer::get_remaining() const {
+ return remaining_;
+}
+
+void deserializer::set_remaining(std::size_t _remaining) {
+ remaining_ = _remaining;
+}
+
+bool deserializer::deserialize(uint8_t& _value) {
+ if (0 == remaining_)
+ return false;
+
+ _value = *position_++;
+
+ remaining_--;
+ return true;
+}
+
+bool deserializer::deserialize(uint16_t& _value) {
+ if (2 > remaining_)
+ return false;
+
+ uint8_t byte0, byte1;
+ byte0 = *position_++;
+ byte1 = *position_++;
+ remaining_ -= 2;
+
+ _value = VSOMEIP_BYTES_TO_WORD(byte0, byte1);
+
+ return true;
+}
+
+bool deserializer::deserialize(uint32_t &_value, bool _omit_last_byte) {
+ if (3 > remaining_ || (!_omit_last_byte && 4 > remaining_))
+ return false;
+
+ uint8_t byte0 = 0, byte1, byte2, byte3;
+ if (!_omit_last_byte) {
+ byte0 = *position_++;
+ remaining_--;
+ }
+ byte1 = *position_++;
+ byte2 = *position_++;
+ byte3 = *position_++;
+ remaining_ -= 3;
+
+ _value = VSOMEIP_BYTES_TO_LONG(
+ byte0, byte1, byte2, byte3);
+
+ return true;
+}
+
+bool deserializer::deserialize(uint8_t *_data, std::size_t _length) {
+ if (_length > remaining_)
+ return false;
+
+ std::memcpy(_data, &data_[static_cast<std::vector<byte_t>::size_type>(position_ - data_.begin())], _length);
+ position_ += static_cast<std::vector<byte_t>::difference_type>(_length);
+ remaining_ -= _length;
+
+ return true;
+}
+
+bool deserializer::deserialize(std::string& _target, std::size_t _length) {
+ if (_length > remaining_ || _length > _target.capacity()) {
+ return false;
+ }
+ _target.assign(position_, position_ + _length);
+ position_ += _length;
+ remaining_ -= _length;
+
+ return true;
+}
+
+bool deserializer::deserialize(std::vector< uint8_t >& _value) {
+ if (_value.capacity() > remaining_)
+ return false;
+
+ _value.assign(position_, position_
+ + static_cast<std::vector<byte_t>::difference_type>(_value.capacity()));
+ position_ += static_cast<std::vector<byte_t>::difference_type>(_value.capacity());
+ remaining_ -= _value.capacity();
+
+ return true;
+}
+
+bool deserializer::look_ahead(std::size_t _index, uint8_t &_value) const {
+ if (_index >= data_.size())
+ return false;
+
+ _value = *(position_ + static_cast<std::vector<byte_t>::difference_type>(_index));
+
+ return true;
+}
+
+bool deserializer::look_ahead(std::size_t _index, uint16_t &_value) const {
+ if (_index+1 >= data_.size())
+ return false;
+
+ std::vector< uint8_t >::iterator i = position_ +
+ static_cast<std::vector<byte_t>::difference_type>(_index);
+ _value = VSOMEIP_BYTES_TO_WORD(*i, *(i+1));
+
+ return true;
+}
+
+bool deserializer::look_ahead(std::size_t _index, uint32_t &_value) const {
+ if (_index+3 >= data_.size())
+ return false;
+
+ std::vector< uint8_t >::const_iterator i = position_ + static_cast<std::vector<byte_t>::difference_type>(_index);
+ _value = VSOMEIP_BYTES_TO_LONG(*i, *(i+1), *(i+2), *(i+3));
+
+ return true;
+}
+
+message_impl * deserializer::deserialize_message() {
+ message_impl* deserialized_message = new message_impl;
+ if (0 != deserialized_message) {
+ if (false == deserialized_message->deserialize(this)) {
+ VSOMEIP_ERROR << "SOME/IP message deserialization failed!";
+ delete deserialized_message;
+ deserialized_message = nullptr;
+ }
+ }
+
+ return deserialized_message;
+}
+
+void deserializer::set_data(const byte_t *_data, std::size_t _length) {
+ if (0 != _data) {
+ data_.assign(_data, _data + _length);
+ position_ = data_.begin();
+ remaining_ = static_cast<std::vector<byte_t>::size_type>(data_.end() - position_);
+ } else {
+ data_.clear();
+ position_ = data_.end();
+ remaining_ = 0;
+ }
+}
+
+void deserializer::append_data(const byte_t *_data, std::size_t _length) {
+ std::vector<byte_t>::difference_type offset = (position_ - data_.begin());
+ data_.insert(data_.end(), _data, _data + _length);
+ position_ = data_.begin() + offset;
+ remaining_ += _length;
+}
+
+void deserializer::drop_data(std::size_t _length) {
+ if (position_ + static_cast<std::vector<byte_t>::difference_type>(_length) < data_.end())
+ position_ += static_cast<std::vector<byte_t>::difference_type>(_length);
+ else
+ position_ = data_.end();
+}
+
+void deserializer::reset() {
+ if (buffer_shrink_threshold_) {
+ if (data_.size() < (data_.capacity() >> 1)) {
+ shrink_count_++;
+ } else {
+ shrink_count_ = 0;
+ }
+ }
+ data_.clear();
+ position_ = data_.begin();
+ remaining_ = data_.size();
+ if (buffer_shrink_threshold_ && shrink_count_ > buffer_shrink_threshold_) {
+ data_.shrink_to_fit();
+ shrink_count_ = 0;
+ }
+}
+
+#ifdef VSOMEIP_DEBUGGING
+void deserializer::show() const {
+ std::stringstream its_message;
+ its_message << "("
+ << std::hex << std::setw(2) << std::setfill('0')
+ << (int)*position_ << ", "
+ << std:: dec << remaining_ << ") ";
+ for (int i = 0; i < data_.size(); ++i)
+ its_message << std::hex << std::setw(2) << std::setfill('0')
+ << (int)data_[i] << " ";
+ VSOMEIP_INFO << its_message;
+}
+#endif
+
+} // namespace vsomeip_v3
diff --git a/implementation/message/src/message_base_impl.cpp b/implementation/message/src/message_base_impl.cpp
index e32a914..43295c4 100644
--- a/implementation/message/src/message_base_impl.cpp
+++ b/implementation/message/src/message_base_impl.cpp
@@ -1,131 +1,122 @@
-// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include "../include/message_impl.hpp"
-#include "../../utility/include/byteorder.hpp"
-
-namespace vsomeip {
-
-message_base_impl::message_base_impl()
- : is_reliable_(false),
- is_initial_(false),
- is_valid_crc_(true) {
- header_.set_owner(this);
-}
-
-message_base_impl::~message_base_impl() {
-}
-
-// header interface
-message_t message_base_impl::get_message() const {
- return VSOMEIP_WORDS_TO_LONG(header_.service_, header_.method_);
-}
-
-void message_base_impl::set_message(message_t _message) {
- header_.service_ = VSOMEIP_LONG_WORD0(_message);
- header_.method_ = VSOMEIP_LONG_WORD1(_message);
-}
-
-service_t message_base_impl::get_service() const {
- return header_.service_;
-}
-
-void message_base_impl::set_service(service_t _service) {
- header_.service_ = _service;
-}
-
-instance_t message_base_impl::get_instance() const {
- return header_.instance_;
-}
-
-void message_base_impl::set_instance(instance_t _instance) {
- header_.instance_ = _instance;
-}
-
-method_t message_base_impl::get_method() const {
- return header_.method_;
-}
-
-void message_base_impl::set_method(method_t _method) {
- header_.method_ = _method;
-}
-
-request_t message_base_impl::get_request() const {
- return VSOMEIP_WORDS_TO_LONG(header_.client_, header_.session_);
-}
-
-client_t message_base_impl::get_client() const {
- return header_.client_;
-}
-
-void message_base_impl::set_client(client_t _client) {
- header_.client_ = _client;
-}
-
-session_t message_base_impl::get_session() const {
- return header_.session_;
-}
-
-void message_base_impl::set_session(session_t _session) {
- header_.session_ = _session;
-}
-
-protocol_version_t message_base_impl::get_protocol_version() const {
- return header_.protocol_version_;
-}
-
-void message_base_impl::set_protocol_version(protocol_version_t _protocol_version) {
- header_.protocol_version_ = _protocol_version;
-}
-
-interface_version_t message_base_impl::get_interface_version() const {
- return header_.interface_version_;
-}
-
-void message_base_impl::set_interface_version(interface_version_t _interface_version) {
- header_.interface_version_ = _interface_version;
-}
-
-message_type_e message_base_impl::get_message_type() const {
- return header_.type_;
-}
-
-void message_base_impl::set_message_type(message_type_e _type) {
- header_.type_ = _type;
-}
-
-return_code_e message_base_impl::get_return_code() const {
- return header_.code_;
-}
-
-void message_base_impl::set_return_code(return_code_e _code) {
- header_.code_ = _code;
-}
-
-bool message_base_impl::is_reliable() const {
- return is_reliable_;
-}
-
-void message_base_impl::set_reliable(bool _is_reliable) {
- is_reliable_ = _is_reliable;
-}
-
-bool message_base_impl::is_initial() const {
- return is_initial_;
-}
-void message_base_impl::set_initial(bool _is_initial) {
- is_initial_ = _is_initial;
-}
-
-bool message_base_impl::is_valid_crc() const {
- return is_valid_crc_;
-}
-
-void message_base_impl::set_is_valid_crc(bool _is_valid_crc) {
- is_valid_crc_ = _is_valid_crc;
-}
-
-
-} // namespace vsomeip
+// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include "../include/message_impl.hpp"
+#include "../../utility/include/byteorder.hpp"
+
+namespace vsomeip_v3 {
+
+message_base_impl::message_base_impl()
+ : is_reliable_(false),
+ is_initial_(false) {
+ header_.set_owner(this);
+}
+
+message_base_impl::~message_base_impl() {
+}
+
+// header interface
+message_t message_base_impl::get_message() const {
+ return VSOMEIP_WORDS_TO_LONG(header_.service_, header_.method_);
+}
+
+void message_base_impl::set_message(message_t _message) {
+ header_.service_ = VSOMEIP_LONG_WORD0(_message);
+ header_.method_ = VSOMEIP_LONG_WORD1(_message);
+}
+
+service_t message_base_impl::get_service() const {
+ return header_.service_;
+}
+
+void message_base_impl::set_service(service_t _service) {
+ header_.service_ = _service;
+}
+
+instance_t message_base_impl::get_instance() const {
+ return header_.instance_;
+}
+
+void message_base_impl::set_instance(instance_t _instance) {
+ header_.instance_ = _instance;
+}
+
+method_t message_base_impl::get_method() const {
+ return header_.method_;
+}
+
+void message_base_impl::set_method(method_t _method) {
+ header_.method_ = _method;
+}
+
+request_t message_base_impl::get_request() const {
+ return VSOMEIP_WORDS_TO_LONG(header_.client_, header_.session_);
+}
+
+client_t message_base_impl::get_client() const {
+ return header_.client_;
+}
+
+void message_base_impl::set_client(client_t _client) {
+ header_.client_ = _client;
+}
+
+session_t message_base_impl::get_session() const {
+ return header_.session_;
+}
+
+void message_base_impl::set_session(session_t _session) {
+ header_.session_ = _session;
+}
+
+protocol_version_t message_base_impl::get_protocol_version() const {
+ return header_.protocol_version_;
+}
+
+void message_base_impl::set_protocol_version(protocol_version_t _protocol_version) {
+ header_.protocol_version_ = _protocol_version;
+}
+
+interface_version_t message_base_impl::get_interface_version() const {
+ return header_.interface_version_;
+}
+
+void message_base_impl::set_interface_version(interface_version_t _interface_version) {
+ header_.interface_version_ = _interface_version;
+}
+
+message_type_e message_base_impl::get_message_type() const {
+ return header_.type_;
+}
+
+void message_base_impl::set_message_type(message_type_e _type) {
+ header_.type_ = _type;
+}
+
+return_code_e message_base_impl::get_return_code() const {
+ return header_.code_;
+}
+
+void message_base_impl::set_return_code(return_code_e _code) {
+ header_.code_ = _code;
+}
+
+bool message_base_impl::is_reliable() const {
+ return is_reliable_;
+}
+
+void message_base_impl::set_reliable(bool _is_reliable) {
+ is_reliable_ = _is_reliable;
+}
+
+bool message_base_impl::is_initial() const {
+ return is_initial_;
+}
+
+void message_base_impl::set_initial(bool _is_initial) {
+ is_initial_ = _is_initial;
+}
+
+} // namespace vsomeip_v3
diff --git a/implementation/message/src/message_header_impl.cpp b/implementation/message/src/message_header_impl.cpp
index 3965453..27950e7 100644
--- a/implementation/message/src/message_header_impl.cpp
+++ b/implementation/message/src/message_header_impl.cpp
@@ -1,80 +1,80 @@
-// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <vsomeip/defines.hpp>
-
-#include "../include/message_base_impl.hpp"
-#include "../include/message_header_impl.hpp"
-#include "../include/serializer.hpp"
-#include "../include/deserializer.hpp"
-
-namespace vsomeip {
-
-message_header_impl::message_header_impl()
- : service_(0x0), method_(0x0), length_(0x0),
- client_(0x0), session_(0x0),
- protocol_version_(0x1), interface_version_(0x0),
- type_(message_type_e::MT_UNKNOWN),
- code_(return_code_e::E_UNKNOWN),
- instance_(0x0), owner_(0x0) {
-}
-
-message_header_impl::message_header_impl(const message_header_impl &_header)
- : service_(_header.service_), method_(_header.method_),
- length_(_header.length_),
- client_(_header.client_), session_(_header.session_),
- protocol_version_(_header.protocol_version_),
- interface_version_(_header.interface_version_),
- type_(_header.type_),
- code_(_header.code_),
- instance_(_header.instance_), owner_(_header.owner_) {
-}
-
-bool message_header_impl::serialize(serializer *_to) const {
- return (0 != _to
- && _to->serialize(service_)
- && _to->serialize(method_)
- && _to->serialize(owner_->get_length())
- && _to->serialize(client_)
- && _to->serialize(session_)
- && _to->serialize(protocol_version_)
- && _to->serialize(interface_version_)
- && _to->serialize(static_cast<uint8_t>(type_))
- && _to->serialize(static_cast<uint8_t>(code_)));
-}
-
-bool message_header_impl::deserialize(deserializer *_from) {
- bool is_successful;
-
- uint8_t tmp_message_type, tmp_return_code;
-
- is_successful = (0 != _from
- && _from->deserialize(service_)
- && _from->deserialize(method_)
- && _from->deserialize(length_)
- && _from->deserialize(client_)
- && _from->deserialize(session_)
- && _from->deserialize(protocol_version_)
- && _from->deserialize(interface_version_)
- && _from->deserialize(tmp_message_type)
- && _from->deserialize(tmp_return_code));
-
- if (is_successful) {
- type_ = static_cast< message_type_e >(tmp_message_type);
- code_ = static_cast< return_code_e >(tmp_return_code);
- }
-
- return is_successful;
-}
-
-message_base * message_header_impl::get_owner() const {
- return owner_;
-}
-
-void message_header_impl::set_owner(message_base *_owner) {
- owner_ = _owner;
-}
-
-} // namespace vsomeip
+// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include <vsomeip/defines.hpp>
+
+#include "../include/message_base_impl.hpp"
+#include "../include/message_header_impl.hpp"
+#include "../include/serializer.hpp"
+#include "../include/deserializer.hpp"
+
+namespace vsomeip_v3 {
+
+message_header_impl::message_header_impl()
+ : service_(0x0), method_(0x0), length_(0x0),
+ client_(0x0), session_(0x0),
+ protocol_version_(0x1), interface_version_(0x0),
+ type_(message_type_e::MT_UNKNOWN),
+ code_(return_code_e::E_UNKNOWN),
+ instance_(0x0), owner_(0x0) {
+}
+
+message_header_impl::message_header_impl(const message_header_impl &_header)
+ : service_(_header.service_), method_(_header.method_),
+ length_(_header.length_),
+ client_(_header.client_), session_(_header.session_),
+ protocol_version_(_header.protocol_version_),
+ interface_version_(_header.interface_version_),
+ type_(_header.type_),
+ code_(_header.code_),
+ instance_(_header.instance_), owner_(_header.owner_) {
+}
+
+bool message_header_impl::serialize(serializer *_to) const {
+ return (0 != _to
+ && _to->serialize(service_)
+ && _to->serialize(method_)
+ && _to->serialize(owner_->get_length())
+ && _to->serialize(client_)
+ && _to->serialize(session_)
+ && _to->serialize(protocol_version_)
+ && _to->serialize(interface_version_)
+ && _to->serialize(static_cast<uint8_t>(type_))
+ && _to->serialize(static_cast<uint8_t>(code_)));
+}
+
+bool message_header_impl::deserialize(deserializer *_from) {
+ bool is_successful;
+
+ uint8_t tmp_message_type, tmp_return_code;
+
+ is_successful = (0 != _from
+ && _from->deserialize(service_)
+ && _from->deserialize(method_)
+ && _from->deserialize(length_)
+ && _from->deserialize(client_)
+ && _from->deserialize(session_)
+ && _from->deserialize(protocol_version_)
+ && _from->deserialize(interface_version_)
+ && _from->deserialize(tmp_message_type)
+ && _from->deserialize(tmp_return_code));
+
+ if (is_successful) {
+ type_ = static_cast< message_type_e >(tmp_message_type);
+ code_ = static_cast< return_code_e >(tmp_return_code);
+ }
+
+ return is_successful;
+}
+
+message_base * message_header_impl::get_owner() const {
+ return owner_;
+}
+
+void message_header_impl::set_owner(message_base *_owner) {
+ owner_ = _owner;
+}
+
+} // namespace vsomeip_v3
diff --git a/implementation/message/src/message_impl.cpp b/implementation/message/src/message_impl.cpp
index 09a7ba8..25cf584 100644
--- a/implementation/message/src/message_impl.cpp
+++ b/implementation/message/src/message_impl.cpp
@@ -1,50 +1,84 @@
-// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <vsomeip/defines.hpp>
-#include <vsomeip/payload.hpp>
-#include <vsomeip/runtime.hpp>
-
-#include "../include/message_impl.hpp"
-#include "../../utility/include/byteorder.hpp"
-
-namespace vsomeip {
-
-message_impl::message_impl()
- : payload_(runtime::get()->create_payload()) {
-}
-
-message_impl::~message_impl() {
-}
-
-length_t message_impl::get_length() const {
- return (VSOMEIP_SOMEIP_HEADER_SIZE
- + (payload_ ? payload_->get_length() : 0));
-}
-
-std::shared_ptr< payload > message_impl::get_payload() const {
- return payload_;
-}
-
-void message_impl::set_payload(std::shared_ptr< payload > _payload) {
- payload_ = _payload;
-}
-
-bool message_impl::serialize(serializer *_to) const {
- return (header_.serialize(_to)
- && (payload_ ? payload_->serialize(_to) : true));
-}
-
-bool message_impl::deserialize(deserializer *_from) {
- payload_ = runtime::get()->create_payload();
- bool is_successful = header_.deserialize(_from);
- if (is_successful) {
- payload_->set_capacity(header_.length_ - VSOMEIP_SOMEIP_HEADER_SIZE);
- is_successful = payload_->deserialize(_from);
- }
- return is_successful;
-}
-
-} // namespace vsomeip
+// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include <vsomeip/defines.hpp>
+#include <vsomeip/payload.hpp>
+#include <vsomeip/runtime.hpp>
+
+#include "../include/message_impl.hpp"
+#ifdef ANDROID
+#include "../../configuration/include/internal_android.hpp"
+#else
+#include "../../configuration/include/internal.hpp"
+#endif
+#include "../../utility/include/byteorder.hpp"
+
+namespace vsomeip_v3 {
+
+message_impl::message_impl()
+ : payload_(runtime::get()->create_payload()),
+ check_result_(0), uid_(ANY_UID), gid_(ANY_GID) {
+}
+
+message_impl::~message_impl() {
+}
+
+length_t message_impl::get_length() const {
+ return (VSOMEIP_SOMEIP_HEADER_SIZE
+ + (payload_ ? payload_->get_length() : 0));
+}
+
+std::shared_ptr< payload > message_impl::get_payload() const {
+ return payload_;
+}
+
+void message_impl::set_payload(std::shared_ptr< payload > _payload) {
+ payload_ = _payload;
+}
+
+bool message_impl::serialize(serializer *_to) const {
+ return (header_.serialize(_to)
+ && (payload_ ? payload_->serialize(_to) : true));
+}
+
+bool message_impl::deserialize(deserializer *_from) {
+ payload_ = runtime::get()->create_payload();
+ bool is_successful = header_.deserialize(_from);
+ if (is_successful) {
+ payload_->set_capacity(header_.length_ - VSOMEIP_SOMEIP_HEADER_SIZE);
+ is_successful = payload_->deserialize(_from);
+ }
+ return is_successful;
+}
+
+uint8_t message_impl::get_check_result() const {
+ return check_result_;
+}
+
+void message_impl::set_check_result(uint8_t _check_result) {
+ check_result_ = _check_result;
+}
+
+bool message_impl::is_valid_crc() const {
+ return (check_result_ == 0);
+}
+
+uid_t message_impl::get_uid() const {
+ return uid_;
+}
+
+void message_impl::set_uid(uid_t _uid) {
+ uid_ = _uid;
+}
+
+uid_t message_impl::get_gid() const {
+ return gid_;
+}
+
+void message_impl::set_gid(gid_t _gid) {
+ gid_ = _gid;
+}
+
+} // namespace vsomeip_v3
diff --git a/implementation/message/src/payload_impl.cpp b/implementation/message/src/payload_impl.cpp
index 9794976..dd1a6aa 100644
--- a/implementation/message/src/payload_impl.cpp
+++ b/implementation/message/src/payload_impl.cpp
@@ -1,79 +1,79 @@
-// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include "../include/deserializer.hpp"
-#include "../include/payload_impl.hpp"
-#include "../include/serializer.hpp"
-
-namespace vsomeip {
-
-payload_impl::payload_impl()
- : data_() {
-}
-
-payload_impl::payload_impl(const byte_t *_data, uint32_t _size) {
- data_.assign(_data, _data + _size);
-}
-
-payload_impl::payload_impl(const std::vector<byte_t> &_data)
- : data_(_data) {
-}
-
-payload_impl::payload_impl(const payload_impl& _payload)
- : data_(_payload.data_) {
-}
-
-payload_impl::~payload_impl() {
-}
-
-bool payload_impl::operator==(const payload &_other) {
- bool is_equal(true);
- try {
- const payload_impl &other = dynamic_cast< const payload_impl & >(_other);
- is_equal = (data_ == other.data_);
- }
- catch (...) {
- is_equal = false;
- }
- return is_equal;
-}
-
-byte_t * payload_impl::get_data() {
- return data_.data();
-}
-
-const byte_t * payload_impl::get_data() const {
- return data_.data();
-}
-
-length_t payload_impl::get_length() const {
- return length_t(data_.size());
-}
-
-void payload_impl::set_capacity(length_t _capacity) {
- data_.reserve(_capacity);
-}
-
-void payload_impl::set_data(const byte_t *_data, const length_t _length) {
- data_.assign(_data, _data + _length);
-}
-
-void payload_impl::set_data(const std::vector< byte_t > &_data) {
- data_ = _data;
-}
-
-void payload_impl::set_data(std::vector< byte_t > &&_data) {
- data_ = std::move(_data);
-}
-
-bool payload_impl::serialize(serializer *_to) const {
- return (0 != _to && _to->serialize(data_));
-}
-
-bool payload_impl::deserialize(deserializer *_from) {
- return (0 != _from && _from->deserialize(data_));
-}
-
-} // namespace vsomeip
+// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include "../include/deserializer.hpp"
+#include "../include/payload_impl.hpp"
+#include "../include/serializer.hpp"
+
+namespace vsomeip_v3 {
+
+payload_impl::payload_impl()
+ : data_() {
+}
+
+payload_impl::payload_impl(const byte_t *_data, uint32_t _size) {
+ data_.assign(_data, _data + _size);
+}
+
+payload_impl::payload_impl(const std::vector<byte_t> &_data)
+ : data_(_data) {
+}
+
+payload_impl::payload_impl(const payload_impl& _payload)
+ : data_(_payload.data_) {
+}
+
+payload_impl::~payload_impl() {
+}
+
+bool payload_impl::operator==(const payload &_other) {
+ bool is_equal(true);
+ try {
+ const payload_impl &other = dynamic_cast< const payload_impl & >(_other);
+ is_equal = (data_ == other.data_);
+ }
+ catch (...) {
+ is_equal = false;
+ }
+ return is_equal;
+}
+
+byte_t * payload_impl::get_data() {
+ return data_.data();
+}
+
+const byte_t * payload_impl::get_data() const {
+ return data_.data();
+}
+
+length_t payload_impl::get_length() const {
+ return length_t(data_.size());
+}
+
+void payload_impl::set_capacity(length_t _capacity) {
+ data_.reserve(_capacity);
+}
+
+void payload_impl::set_data(const byte_t *_data, const length_t _length) {
+ data_.assign(_data, _data + _length);
+}
+
+void payload_impl::set_data(const std::vector< byte_t > &_data) {
+ data_ = _data;
+}
+
+void payload_impl::set_data(std::vector< byte_t > &&_data) {
+ data_ = std::move(_data);
+}
+
+bool payload_impl::serialize(serializer *_to) const {
+ return (0 != _to && _to->serialize(data_));
+}
+
+bool payload_impl::deserialize(deserializer *_from) {
+ return (0 != _from && _from->deserialize(data_));
+}
+
+} // namespace vsomeip_v3
diff --git a/implementation/message/src/serializer.cpp b/implementation/message/src/serializer.cpp
index d9277d6..fe5196e 100644
--- a/implementation/message/src/serializer.cpp
+++ b/implementation/message/src/serializer.cpp
@@ -1,122 +1,122 @@
-// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-//#include <cstring>
-
-#ifdef VSOMEIP_DEBUGGING
-#include <iomanip>
-#include <sstream>
-#endif
-
-#include <vsomeip/internal/serializable.hpp>
-
-#include "../include/serializer.hpp"
-#include "../../utility/include/byteorder.hpp"
-#include "../../logging/include/logger.hpp"
-
-namespace vsomeip {
-
-serializer::serializer(std::uint32_t _buffer_shrink_threshold) :
- data_(0),
- shrink_count_(0),
- buffer_shrink_threshold_(_buffer_shrink_threshold) {
-}
-
-serializer::~serializer() {
-}
-
-bool serializer::serialize(const serializable *_from) {
- return (_from && _from->serialize(this));
-}
-
-bool serializer::serialize(const uint8_t _value) {
- data_.push_back(_value);
- return true;
-}
-
-bool serializer::serialize(const uint16_t _value) {
- data_.push_back(VSOMEIP_WORD_BYTE1(_value));
- data_.push_back(VSOMEIP_WORD_BYTE0(_value));
- return true;
-}
-
-bool serializer::serialize(const uint32_t _value, bool _omit_last_byte) {
- if (!_omit_last_byte) {
- data_.push_back(VSOMEIP_LONG_BYTE3(_value));
- }
- data_.push_back(VSOMEIP_LONG_BYTE2(_value));
- data_.push_back(VSOMEIP_LONG_BYTE1(_value));
- data_.push_back(VSOMEIP_LONG_BYTE0(_value));
- return true;
-}
-
-bool serializer::serialize(const uint8_t *_data, uint32_t _length) {
- try {
- data_.insert(data_.end(), _data, _data + _length);
- } catch(const std::bad_alloc &e) {
- VSOMEIP_ERROR << "Couldn't allocate memory in serializer::serialize(*_data, length)" << e.what();
- return false;
- }
- return true;
-}
-
-bool serializer::serialize(const std::vector<byte_t> &_data) {
- try {
- data_.insert(data_.end(),_data.begin(), _data.end());
- } catch(const std::bad_alloc &e) {
- VSOMEIP_ERROR << "Couldn't allocate memory in serializer::serialize(vector)" << e.what();
- return false;
- }
- return true;
-}
-
-const byte_t * serializer::get_data() const {
- return data_.data();
-}
-
-uint32_t serializer::get_capacity() const {
- return static_cast<std::uint32_t>(data_.max_size());
-}
-
-uint32_t serializer::get_size() const {
- return static_cast<std::uint32_t>(data_.size());
-}
-
-void serializer::set_data(byte_t *_data, uint32_t _capacity) {
- data_.clear();
- try {
- data_.insert(data_.end(), _data, _data + _capacity);
- } catch(const std::bad_alloc &e) {
- VSOMEIP_ERROR << "Couldn't allocate memory in serializer::set_data" << e.what();
- }
-}
-
-void serializer::reset() {
- if (buffer_shrink_threshold_) {
- if (data_.size() < (data_.capacity() >> 1)) {
- shrink_count_++;
- } else {
- shrink_count_ = 0;
- }
- }
- data_.clear();
- if (buffer_shrink_threshold_ && shrink_count_ > buffer_shrink_threshold_) {
- data_.shrink_to_fit();
- shrink_count_ = 0;
- }
-}
-
-#ifdef VSOMEIP_DEBUGGING
-void serializer::show() {
- std::stringstream its_data;
- its_data << "SERIALIZED: ";
- for (const byte_t& e : data_)
- its_data << std::setw(2) << std::setfill('0')
- << std::hex << (int)e;
- VSOMEIP_INFO << its_data.str();
-}
-#endif
-
-} // namespace vsomeip
+// Copyright (C) 2014-2017 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+//#include <cstring>
+
+#ifdef VSOMEIP_DEBUGGING
+#include <iomanip>
+#include <sstream>
+#endif
+
+#include <vsomeip/internal/serializable.hpp>
+
+#include "../include/serializer.hpp"
+#include "../../utility/include/byteorder.hpp"
+#include <vsomeip/internal/logger.hpp>
+
+namespace vsomeip_v3 {
+
+serializer::serializer(std::uint32_t _buffer_shrink_threshold) :
+ data_(0),
+ shrink_count_(0),
+ buffer_shrink_threshold_(_buffer_shrink_threshold) {
+}
+
+serializer::~serializer() {
+}
+
+bool serializer::serialize(const serializable *_from) {
+ return (_from && _from->serialize(this));
+}
+
+bool serializer::serialize(const uint8_t _value) {
+ data_.push_back(_value);
+ return true;
+}
+
+bool serializer::serialize(const uint16_t _value) {
+ data_.push_back(VSOMEIP_WORD_BYTE1(_value));
+ data_.push_back(VSOMEIP_WORD_BYTE0(_value));
+ return true;
+}
+
+bool serializer::serialize(const uint32_t _value, bool _omit_last_byte) {
+ if (!_omit_last_byte) {
+ data_.push_back(VSOMEIP_LONG_BYTE3(_value));
+ }
+ data_.push_back(VSOMEIP_LONG_BYTE2(_value));
+ data_.push_back(VSOMEIP_LONG_BYTE1(_value));
+ data_.push_back(VSOMEIP_LONG_BYTE0(_value));
+ return true;
+}
+
+bool serializer::serialize(const uint8_t *_data, uint32_t _length) {
+ try {
+ data_.insert(data_.end(), _data, _data + _length);
+ } catch(const std::bad_alloc &e) {
+ VSOMEIP_ERROR << "Couldn't allocate memory in serializer::serialize(*_data, length)" << e.what();
+ return false;
+ }
+ return true;
+}
+
+bool serializer::serialize(const std::vector<byte_t> &_data) {
+ try {
+ data_.insert(data_.end(),_data.begin(), _data.end());
+ } catch(const std::bad_alloc &e) {
+ VSOMEIP_ERROR << "Couldn't allocate memory in serializer::serialize(vector)" << e.what();
+ return false;
+ }
+ return true;
+}
+
+const byte_t * serializer::get_data() const {
+ return data_.data();
+}
+
+uint32_t serializer::get_capacity() const {
+ return static_cast<std::uint32_t>(data_.max_size());
+}
+
+uint32_t serializer::get_size() const {
+ return static_cast<std::uint32_t>(data_.size());
+}
+
+void serializer::set_data(byte_t *_data, uint32_t _capacity) {
+ data_.clear();
+ try {
+ data_.insert(data_.end(), _data, _data + _capacity);
+ } catch(const std::bad_alloc &e) {
+ VSOMEIP_ERROR << "Couldn't allocate memory in serializer::set_data" << e.what();
+ }
+}
+
+void serializer::reset() {
+ if (buffer_shrink_threshold_) {
+ if (data_.size() < (data_.capacity() >> 1)) {
+ shrink_count_++;
+ } else {
+ shrink_count_ = 0;
+ }
+ }
+ data_.clear();
+ if (buffer_shrink_threshold_ && shrink_count_ > buffer_shrink_threshold_) {
+ data_.shrink_to_fit();
+ shrink_count_ = 0;
+ }
+}
+
+#ifdef VSOMEIP_DEBUGGING
+void serializer::show() {
+ std::stringstream its_data;
+ its_data << "SERIALIZED: ";
+ for (const byte_t& e : data_)
+ its_data << std::setw(2) << std::setfill('0')
+ << std::hex << (int)e;
+ VSOMEIP_INFO << its_data.str();
+}
+#endif
+
+} // namespace vsomeip_v3
View Lorry Controller Status