diff options
| -rw-r--r-- | exportmap.gcc | 4 | ||||
| -rw-r--r-- | implementation/configuration/include/configuration_impl.hpp | 6 | ||||
| -rw-r--r-- | implementation/configuration/src/configuration_impl.cpp | 14 | ||||
| -rw-r--r-- | implementation/service_discovery/src/service_discovery_fsm.cpp | 5 | ||||
| -rw-r--r-- | interface/vsomeip/configuration.hpp | 6 | ||||
| -rw-r--r-- | interface/vsomeip/defines.hpp | 9 |
6 files changed, 28 insertions, 16 deletions
diff --git a/exportmap.gcc b/exportmap.gcc index f0b99c2..92cc98c 100644 --- a/exportmap.gcc +++ b/exportmap.gcc @@ -3,6 +3,8 @@ global: extern "C++" { *vsomeip::configuration; vsomeip::configuration::*; + *vsomeip::serializer; + vsomeip::serializer::*; *vsomeip::deserializer; vsomeip::deserializer::*; *vsomeip::tcp*; @@ -13,6 +15,8 @@ global: vsomeip::logger::get*; *vsomeip::message_base_impl; *vsomeip::message_base_impl::*; + *vsomeip::message_header_impl; + *vsomeip::message_header_impl::*; *vsomeip::runtime; vsomeip::runtime::get*; *vsomeip::application_impl; diff --git a/implementation/configuration/include/configuration_impl.hpp b/implementation/configuration/include/configuration_impl.hpp index 646f6a0..a90355e 100644 --- a/implementation/configuration/include/configuration_impl.hpp +++ b/implementation/configuration/include/configuration_impl.hpp @@ -46,10 +46,10 @@ public: bool is_local_servicegroup(const std::string &_name) const; int32_t get_min_initial_delay(const std::string &_name) const; int32_t get_max_initial_delay(const std::string &_name) const; - uint32_t get_repetition_base_delay(const std::string &_name) const; + int32_t get_repetition_base_delay(const std::string &_name) const; uint8_t get_repetition_max(const std::string &_name) const; - uint32_t get_cyclic_offer_delay(const std::string &_name) const; - uint32_t get_cyclic_request_delay(const std::string &_name) const; + int32_t get_cyclic_offer_delay(const std::string &_name) const; + int32_t get_cyclic_request_delay(const std::string &_name) const; std::string get_address(service_t _service, instance_t _instance) const; uint16_t get_reliable_port(service_t _service, instance_t _instance) const; diff --git a/implementation/configuration/src/configuration_impl.cpp b/implementation/configuration/src/configuration_impl.cpp index 5edc5ee..984a645 100644 --- a/implementation/configuration/src/configuration_impl.cpp +++ b/implementation/configuration/src/configuration_impl.cpp @@ -479,8 +479,8 @@ int32_t configuration_impl::get_max_initial_delay(const std::string &_name) cons return its_delay; } -uint32_t configuration_impl::get_repetition_base_delay(const std::string &_name) const { - uint32_t its_delay = 0xFFFFFFFF; +int32_t configuration_impl::get_repetition_base_delay(const std::string &_name) const { + int32_t its_delay = VSOMEIP_DEFAULT_REPETITION_BASE_DELAY; servicegroup *its_servicegroup = find_servicegroup(_name); if (its_servicegroup) its_delay = its_servicegroup->repetition_base_delay_; @@ -489,7 +489,7 @@ uint32_t configuration_impl::get_repetition_base_delay(const std::string &_name) } uint8_t configuration_impl::get_repetition_max(const std::string &_name) const { - uint8_t its_max = 0; + uint8_t its_max = VSOMEIP_DEFAULT_REPETITION_MAX; servicegroup *its_servicegroup = find_servicegroup(_name); if (its_servicegroup) its_max = its_servicegroup->repetition_max_; @@ -497,8 +497,8 @@ uint8_t configuration_impl::get_repetition_max(const std::string &_name) const { return its_max; } -uint32_t configuration_impl::get_cyclic_offer_delay(const std::string &_name) const { - uint32_t its_delay = 0xFFFFFFFF; +int32_t configuration_impl::get_cyclic_offer_delay(const std::string &_name) const { + uint32_t its_delay = VSOMEIP_DEFAULT_CYCLIC_OFFER_DELAY; servicegroup *its_servicegroup = find_servicegroup(_name); if (its_servicegroup) its_delay = its_servicegroup->cyclic_offer_delay_; @@ -506,8 +506,8 @@ uint32_t configuration_impl::get_cyclic_offer_delay(const std::string &_name) co return its_delay; } -uint32_t configuration_impl::get_cyclic_request_delay(const std::string &_name) const { - uint32_t its_delay = 0xFFFFFFFF; +int32_t configuration_impl::get_cyclic_request_delay(const std::string &_name) const { + uint32_t its_delay = VSOMEIP_DEFAULT_CYCLIC_REQUEST_DELAY; servicegroup *its_servicegroup = find_servicegroup(_name); if (its_servicegroup) its_delay = its_servicegroup->cyclic_request_delay_; diff --git a/implementation/service_discovery/src/service_discovery_fsm.cpp b/implementation/service_discovery/src/service_discovery_fsm.cpp index 81314d0..60a38a7 100644 --- a/implementation/service_discovery/src/service_discovery_fsm.cpp +++ b/implementation/service_discovery/src/service_discovery_fsm.cpp @@ -21,7 +21,10 @@ namespace sd { /////////////////////////////////////////////////////////////////////////////// namespace _sd { -fsm::fsm(service_discovery_fsm *_fsm): fsm_(_fsm), fsm_base(_fsm->get_io()) { +fsm::fsm(service_discovery_fsm *_fsm): + fsm_(_fsm), + fsm_base(_fsm->get_io()), + is_up_(true) { configuration *its_configuration = configuration::get(); } diff --git a/interface/vsomeip/configuration.hpp b/interface/vsomeip/configuration.hpp index 30435ad..d0b3c55 100644 --- a/interface/vsomeip/configuration.hpp +++ b/interface/vsomeip/configuration.hpp @@ -48,10 +48,10 @@ public: virtual bool is_local_servicegroup(const std::string &_name) const = 0; virtual int32_t get_min_initial_delay(const std::string &_name) const = 0; virtual int32_t get_max_initial_delay(const std::string &_name) const = 0; - virtual uint32_t get_repetition_base_delay(const std::string &_name) const = 0; + virtual int32_t get_repetition_base_delay(const std::string &_name) const = 0; virtual uint8_t get_repetition_max(const std::string &_name) const = 0; - virtual uint32_t get_cyclic_offer_delay(const std::string &_name) const = 0; - virtual uint32_t get_cyclic_request_delay(const std::string &_name) const = 0; + virtual int32_t get_cyclic_offer_delay(const std::string &_name) const = 0; + virtual int32_t get_cyclic_request_delay(const std::string &_name) const = 0; virtual std::string get_address(service_t _service, instance_t _instance) const = 0; virtual uint16_t get_reliable_port(service_t _service, instance_t _instance) const = 0; diff --git a/interface/vsomeip/defines.hpp b/interface/vsomeip/defines.hpp index dc2f302..c3eef13 100644 --- a/interface/vsomeip/defines.hpp +++ b/interface/vsomeip/defines.hpp @@ -39,7 +39,12 @@ #define VSOMEIP_MESSAGE_TYPE_POS 14 #define VSOMEIP_RETURN_CODE_POS 15 -#define VSOMEIP_DEFAULT_MIN_INITIAL_DELAY 0 -#define VSOMEIP_DEFAULT_MAX_INITIAL_DELAY 3000 +// SD delays +#define VSOMEIP_DEFAULT_MIN_INITIAL_DELAY 0 +#define VSOMEIP_DEFAULT_MAX_INITIAL_DELAY 3000 +#define VSOMEIP_DEFAULT_REPETITION_BASE_DELAY 10 +#define VSOMEIP_DEFAULT_REPETITION_MAX 5 +#define VSOMEIP_DEFAULT_CYCLIC_OFFER_DELAY 1000 +#define VSOMEIP_DEFAULT_CYCLIC_REQUEST_DELAY 2000 #endif // VSOMEIP_DEFINES_HPP |