vsomeip 2.10.0

Author: juergengehring

CHANGES

@@ -1,6 +1,13 @@
 Changes
 =======
 
+v2.10.0
+- Add register_async_subscription_handler to application interface
+- Ensure faster stopping of UDP and TCP endpoints
+- StopSubscribe eventgroup entries of StopSubscribe/Subscribe
+  eventgroup entry sequences in incoming SD messages are now
+  completely handled in the service discovery module
+
 v2.9.5
 - Change magic cookie behaviour to only send a magic cookie every 10
   seconds instead of in front of every SOME/IP message

CMakeLists.txt

@@ -7,8 +7,8 @@ cmake_minimum_required (VERSION 2.8.12)
 project (vsomeip)
 
 set (VSOMEIP_MAJOR_VERSION 2)
-set (VSOMEIP_MINOR_VERSION 9)
-set (VSOMEIP_PATCH_VERSION 5)
+set (VSOMEIP_MINOR_VERSION 10)
+set (VSOMEIP_PATCH_VERSION 0)
 set (VSOMEIP_VERSION ${VSOMEIP_MAJOR_VERSION}.${VSOMEIP_MINOR_VERSION}.${VSOMEIP_PATCH_VERSION})
 set (PACKAGE_VERSION ${VSOMEIP_VERSION}) # Used in documentatin/doxygen.in
 set (CMAKE_VERBOSE_MAKEFILE off)
@@ -447,6 +447,25 @@ if((${TEST_IP_MASTER} STREQUAL ${TEST_IP_DEFAULT_VALUE}) OR
                     "-DTEST_IP_MASTER=10.0.3.1 -DTEST_IP_SLAVE=10.0.3.125")
 endif()
 
+SET(TEST_UID_DEFAULT_VALUE "123456789")
+SET(TEST_UID "${TEST_UID_DEFAULT_VALUE}" CACHE STRING
+    "The User ID of the user running the test: Needed for security")
+SET(TEST_GID_DEFAULT_VALUE "123456789")
+SET(TEST_GID "${TEST_GID_DEFAULT_VALUE}" CACHE STRING
+    "The Group ID of the user running the test: Needed for security")
+
+SET(TEST_SECURITY "ON" CACHE BOOL
+    "Controls whether security tests should run or not")
+
+if((${TEST_UID} STREQUAL ${TEST_UID_DEFAULT_VALUE}) OR
+   (${TEST_GID}  STREQUAL ${TEST_GID_DEFAULT_VALUE}))
+    message(WARNING "TEST_UID and/or TEST_GID isn't set. "
+                    "Security Tests are not runnable "
+                    "Please specify them for example "
+                    "-DTEST_UID=1000 -DTEST_GID=1000")
+    SET(TEST_SECURITY "OFF")
+endif()
+
 add_custom_target(build_tests)
 add_dependencies(build_tests vsomeip)
 add_dependencies(build_tests vsomeip-sd)

daemon/vsomeipd.cpp

@@ -22,11 +22,14 @@
 #endif
 
 static std::shared_ptr<vsomeip::application> its_application;
+
+#ifndef VSOMEIP_ENABLE_SIGNAL_HANDLING
 static vsomeip::routing_state_e routing_state = vsomeip::routing_state_e::RS_RUNNING;
 static bool stop_application = false;
 static bool stop_sighandler = false;
 static std::condition_variable_any sighandler_condition;
 static std::recursive_mutex sighandler_mutex;
+#endif
 
 #ifndef VSOMEIP_ENABLE_SIGNAL_HANDLING
 /*

documentation/vsomeipUserGuide

@@ -572,6 +572,36 @@ service instance.
 The list of client ports to be used for unreliable (UDP) communication to the given
 service instance. 
 
++
+Additionally there is the possibility to configure mappings between ranges of client
+ports and ranges of remote service ports.
+(If a client port is configured for a specific service / instance, the port range mapping is ignored)
+
+** `reliable_remote_ports`
++
+Specifies a range of reliable remote service ports
+
+** `unreliable_remote_ports`
++
+Specifies a range of unreliable remote service ports
+
+** `reliable_client_ports`
++
+Specifies the range of reliable client ports to be mapped to the reliable_remote_ports range
+
+** `unreliable_client_ports`
++
+Specifies the range of unreliable client ports to be mapped to the unreliable_remote_ports range
+
+
+** `first`
++
+Specifies the lower bound of a port range
+
+** `last`
++
+Specifies the upper bound of a port range
+
 * `payload-sizes` (array)
 +
 Array to limit the maximum allowed payload sizes per IP and port. If not

implementation/configuration/include/client.hpp

@@ -16,10 +16,14 @@ namespace vsomeip {
 namespace cfg {
 
 struct client {
+    // ports for specific service / instance
     service_t service_;
     instance_t instance_;
-
     std::map<bool, std::set<uint16_t> > ports_;
+
+    // client port ranges mapped to remote port ranges
+    std::map<bool, std::pair<uint16_t, uint16_t> > remote_ports_;
+    std::map<bool, std::pair<uint16_t, uint16_t> > client_ports_;
 };
 
 } // namespace cfg

implementation/configuration/include/configuration.hpp

@@ -63,9 +63,9 @@ class configuration {
 
     virtual bool is_someip(service_t _service, instance_t _instance) const = 0;
 
-    virtual bool get_client_port(
-            service_t _service, instance_t _instance, bool _reliable,
-            std::map<bool, std::set<uint16_t> > &_used, uint16_t &_port) const = 0;
+    virtual bool get_client_port(service_t _service, instance_t _instance,
+            uint16_t _remote_port, bool _reliable,
+            std::map<bool, std::set<uint16_t> > &_used_client_ports, uint16_t &_client_port) const = 0;
 
     virtual std::set<std::pair<service_t, instance_t> > get_remote_services() const = 0;
 

implementation/configuration/include/configuration_impl.hpp

@@ -11,6 +11,7 @@
 #include <mutex>
 #include <vector>
 #include <unordered_set>
+#include <list>
 
 #include <boost/property_tree/ptree.hpp>
 
@@ -76,8 +77,9 @@ class configuration_impl:
 
     VSOMEIP_EXPORT bool is_someip(service_t _service, instance_t _instance) const;
 
-    VSOMEIP_EXPORT bool get_client_port(service_t _service, instance_t _instance, bool _reliable,
-            std::map<bool, std::set<uint16_t> > &_used, uint16_t &_port) const;
+    VSOMEIP_EXPORT bool get_client_port(service_t _service, instance_t _instance,
+            uint16_t _remote_port, bool _reliable,
+            std::map<bool, std::set<uint16_t> > &_used_client_ports, uint16_t &_client_port) const;
 
     VSOMEIP_EXPORT const std::string & get_routing_host() const;
 
@@ -201,7 +203,9 @@ class configuration_impl:
 
     void load_clients(const element &_element);
     void load_client(const boost::property_tree::ptree &_tree);
+
     std::set<uint16_t> load_client_ports(const boost::property_tree::ptree &_tree);
+    std::pair<uint16_t, uint16_t> load_client_port_range(const boost::property_tree::ptree &_tree);
 
     void load_watchdog(const element &_element);
 
@@ -212,7 +216,8 @@ class configuration_impl:
     void load_policy(const boost::property_tree::ptree &_tree);
 
     servicegroup *find_servicegroup(const std::string &_name) const;
-    std::shared_ptr<client> find_client(service_t _service, instance_t _instance) const;
+    std::shared_ptr<client> find_client(service_t _service,
+            instance_t _instance, uint16_t _remote_port, bool _reliable) const;
     std::shared_ptr<service> find_service(service_t _service, instance_t _instance) const;
     std::shared_ptr<eventgroup> find_eventgroup(service_t _service,
             instance_t _instance, eventgroup_t _eventgroup) const;
@@ -222,6 +227,7 @@ class configuration_impl:
     bool is_mandatory(const std::string &_name) const;
     bool is_remote(std::shared_ptr<service> _service) const;
     bool is_internal_service(service_t _service, instance_t _instance) const;
+    bool is_in_port_range(uint16_t _port, std::pair<uint16_t, uint16_t> _port_range) const;
 
     void set_mandatory(const std::string &_input);
     void trim(std::string &_s);
@@ -256,9 +262,7 @@ class configuration_impl:
         std::map<instance_t,
             std::shared_ptr<service> > > services_;
 
-    std::map<service_t,
-        std::map<instance_t,
-            std::shared_ptr<client> > > clients_;
+    std::list< std::shared_ptr<client> > clients_;
 
     std::string routing_host_;
 

implementation/configuration/include/e2e.hpp

@@ -3,8 +3,8 @@
 // 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/.
 
-#ifndef CONFIGURATION_INCLUDE_E2E_HPP_
-#define CONFIGURATION_INCLUDE_E2E_HPP_
+#ifndef VSOMEIP_CFG_E2E_HPP_
+#define VSOMEIP_CFG_E2E_HPP_
 
 #include <string>
 #include <vector>
@@ -14,7 +14,6 @@
 namespace vsomeip {
 namespace cfg {
 
-
 struct e2e {
 
     e2e() :
@@ -64,8 +63,7 @@ struct e2e {
     uint16_t counter_offset;
 };
 
+} // namespace cfg
+} // namespace vsomeip
 
-
-}
-}
-#endif /* CONFIGURATION_INCLUDE_E2E_HPP_ */
+#endif // VSOMEIP_CFG_E2E_HPP_

implementation/configuration/include/internal.hpp.in

@@ -106,9 +106,9 @@
 #define VSOMEIP_REQUEST_SERVICE_COMMAND_SIZE    17
 #define VSOMEIP_RELEASE_SERVICE_COMMAND_SIZE    11
 #define VSOMEIP_STOP_OFFER_SERVICE_COMMAND_SIZE 16
-#define VSOMEIP_SUBSCRIBE_COMMAND_SIZE          18
-#define VSOMEIP_SUBSCRIBE_ACK_COMMAND_SIZE      17
-#define VSOMEIP_SUBSCRIBE_NACK_COMMAND_SIZE     17
+#define VSOMEIP_SUBSCRIBE_COMMAND_SIZE          19
+#define VSOMEIP_SUBSCRIBE_ACK_COMMAND_SIZE      19
+#define VSOMEIP_SUBSCRIBE_NACK_COMMAND_SIZE     19
 #define VSOMEIP_UNSUBSCRIBE_COMMAND_SIZE        16
 #define VSOMEIP_REGISTER_EVENT_COMMAND_SIZE     15
 #define VSOMEIP_UNREGISTER_EVENT_COMMAND_SIZE   14