CommonAPI-SomeIP 3.1.11

COVESA · Feb 28, 2017 · c4cc92f · c4cc92f
1 parent fba3007
commit c4cc92f
Show file tree

Hide file tree

Showing 54 changed files with 352 additions and 155 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,14 @@
 Changes
 =======
 
+v3.1.11
+- Bugfixes
+- Removed Config.hpp. The defines of this file are now located in Constants.hpp
+  as C++ constants.
+- Fixed concurrency issues when hosting multiple instances of the same service
+  in the same binary.
+- Ensure proxy is not destroyed while callback function is invoked
+
 v3.1.10.4
 - Fixed crash (double free) on destruction of static objects
 - Fixed availability issues in verification tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+# Copyright (C) 2013-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/.
@@ -11,7 +11,7 @@ set (CMAKE_VERBOSE_MAKEFILE off)
 
 set (LIBCOMMONAPI_SOMEIP_MAJOR_VERSION 3)
 set (LIBCOMMONAPI_SOMEIP_MINOR_VERSION 1)
-set (LIBCOMMONAPI_SOMEIP_PATCH_VERSION 10)
+set (LIBCOMMONAPI_SOMEIP_PATCH_VERSION 11)
 
 message(STATUS "Project name: ${PROJECT_NAME}")
 
@@ -119,9 +119,9 @@ endforeach ()
 ###################################################################################################
 
 if ("${USE_INSTALLED_COMMONAPI}" STREQUAL "ON")
-    FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
+    FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_CMAKE_PACKAGE_REGISTRY)
 else()
-    FIND_PACKAGE(CommonAPI 3.1.10 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+    FIND_PACKAGE(CommonAPI 3.1.11 REQUIRED CONFIG NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
 endif()
 
 message(STATUS "CommonAPI_CONSIDERED_CONFIGS: ${CommonAPI_CONSIDERED_CONFIGS}")
@@ -132,7 +132,7 @@ message(STATUS "CommonAPI Version: ${CommonAPI_VERSION}")
 find_package( Boost 1.54 COMPONENTS system thread log REQUIRED )
 include_directories( ${Boost_INCLUDE_DIR} )
 
-find_package (vsomeip 2.5.0 REQUIRED)
+find_package (vsomeip 2.5.3 REQUIRED)
 message(STATUS "vsomeip version: ${vsomeip_VERSION}")
 
 include_directories (

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 ### CommonAPI C++ SOME/IP Runtime
 
 ##### Copyright
-Copyright (C) 2016, Bayerische Motoren Werke Aktiengesellschaft (BMW AG).
-Copyright (C) 2016, GENIVI Alliance, Inc.
+Copyright (C) 2016-2017, Bayerische Motoren Werke Aktiengesellschaft (BMW AG).
+Copyright (C) 2016-2017, GENIVI Alliance, Inc.
 
 This file is part of GENIVI Project IPC Common API C++.
 Contributions are licensed to the GENIVI Alliance under one or more Contribution License Agreements or MPL 2.0.

diff --git a/include/CommonAPI/SomeIP/Address.hpp b/include/CommonAPI/SomeIP/Address.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/AddressTranslator.hpp b/include/CommonAPI/SomeIP/AddressTranslator.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/Attribute.hpp b/include/CommonAPI/SomeIP/Attribute.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/ClientId.hpp b/include/CommonAPI/SomeIP/ClientId.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/CommonAPISomeIP.hpp b/include/CommonAPI/SomeIP/CommonAPISomeIP.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// Copyright (C) 2015-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/.

diff --git a/include/CommonAPI/SomeIP/Configuration.hpp b/include/CommonAPI/SomeIP/Configuration.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/Connection.hpp b/include/CommonAPI/SomeIP/Connection.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.
@@ -206,7 +206,7 @@ class Connection:
     virtual void queueSelectiveErrorHandler(service_id_t serviceId,
                                               instance_id_t instanceId);
 
-    virtual void getInitialEvent(service_id_t serviceId,
+    virtual void subscribeForField(service_id_t serviceId,
                                  instance_id_t instanceId,
                                  eventgroup_id_t eventGroupId,
                                  event_id_t eventId,
@@ -251,7 +251,7 @@ class Connection:
 
     ConnectionStatusEvent connectionStatusEvent_;
 
-    state_type_e connectionStatus_;
+    std::atomic<state_type_e> connectionStatus_;
     mutable std::mutex connectionMutex_;
     mutable std::condition_variable connectionCondition_;
 
@@ -327,6 +327,15 @@ class Connection:
 
     std::mutex availabilityCalledMutex_;
     std::map<service_id_t, std::map<instance_id_t, bool>> availabilityCalled_;
+
+    std::mutex requestedServicesMutex_;
+    std::map<service_id_t, std::map<instance_id_t, std::uint32_t>> requestedServices_;
+
+    std::mutex requestedEventsMutex_;
+    std::map<service_id_t,
+        std::map<instance_id_t,
+            std::map<eventgroup_id_t,
+                std::map<event_id_t, std::uint32_t>>>> requestedEvents_;
 };
 
 

diff --git a/include/CommonAPI/SomeIP/Constants.hpp b/include/CommonAPI/SomeIP/Constants.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// Copyright (C) 2013-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/.
@@ -22,9 +22,18 @@
 namespace CommonAPI {
 namespace SomeIP {
 
+const method_id_t ANY_METHOD = vsomeip::ANY_METHOD;
+const minor_version_t ANY_MINOR_VERSION  = vsomeip::ANY_MINOR;
+
 const major_version_t DEFAULT_MAJOR_VERSION = vsomeip::DEFAULT_MAJOR;
 const minor_version_t DEFAULT_MINOR_VERSION = vsomeip::DEFAULT_MINOR;
 
+const service_id_t MIN_SERVICE_ID = 0x0001;
+const service_id_t MAX_SERVICE_ID = 0xFFFD;
+
+const instance_id_t MIN_INSTANCE_ID = 0x0001;
+const instance_id_t MAX_INSTANCE_ID = 0xFFFE;
+
 const ms_t ASYNC_MESSAGE_REPLY_TIMEOUT_MS = 5000;
 const ms_t ASYNC_MESSAGE_CLEANUP_INTERVAL_MS = 1000;
 

diff --git a/include/CommonAPI/SomeIP/Defines.hpp b/include/CommonAPI/SomeIP/Defines.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// Copyright (C) 2013-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/.

diff --git a/include/CommonAPI/SomeIP/Deployment.hpp b/include/CommonAPI/SomeIP/Deployment.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/DispatchSource.hpp b/include/CommonAPI/SomeIP/DispatchSource.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// Copyright (C) 2015-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/.

diff --git a/include/CommonAPI/SomeIP/Event.hpp b/include/CommonAPI/SomeIP/Event.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.
@@ -42,6 +42,8 @@ class Event: public Events_  {
           getMethodId_(0),
           getReliable_(false),
           arguments_(_arguments) {
+
+        proxy_.registerEvent(serviceId_, instanceId_, eventId_, eventgroupId_, isField_);
     }
 
     Event(ProxyBase &_proxy,
@@ -63,12 +65,15 @@ class Event: public Events_  {
           getMethodId_(_methodId),
           getReliable_(_getReliable),
           arguments_(_arguments) {
+
+        proxy_.registerEvent(serviceId_, instanceId_, eventId_, eventgroupId_, isField_);
     }
 
     virtual ~Event() {
         auto major = proxy_.getSomeIpAddress().getMajorVersion();
         auto minor = proxy_.getSomeIpAddress().getMinorVersion();
         proxy_.removeEventHandler(serviceId_, instanceId_, eventgroupId_, eventId_, handler_.get(), major, minor);
+        proxy_.unregisterEvent(serviceId_, instanceId_, eventId_);
     }
 
     virtual void onError(const uint16_t _errorCode, const uint32_t _tag) {

diff --git a/include/CommonAPI/SomeIP/Factory.hpp b/include/CommonAPI/SomeIP/Factory.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.
@@ -24,6 +24,9 @@
 #include <CommonAPI/SomeIP/Types.hpp>
 
 namespace CommonAPI {
+
+class Runtime;
+
 namespace SomeIP {
 
 class Address;
@@ -108,6 +111,8 @@ class Factory : public CommonAPI::Factory {
     // Initialization
     COMMONAPI_EXPORT void registerInterface(InterfaceInitFunction _function);
 
+    static std::weak_ptr<CommonAPI::Runtime> runtime_;
+
 private:
     COMMONAPI_EXPORT void incrementConnection(
             std::shared_ptr<ProxyConnection> _connection);

diff --git a/include/CommonAPI/SomeIP/Helper.hpp b/include/CommonAPI/SomeIP/Helper.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// Copyright (C) 2013-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/.

diff --git a/include/CommonAPI/SomeIP/InputStream.hpp b/include/CommonAPI/SomeIP/InputStream.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/InstanceAvailabilityStatusChangedEvent.hpp b/include/CommonAPI/SomeIP/InstanceAvailabilityStatusChangedEvent.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/InterfaceHandler.hpp b/include/CommonAPI/SomeIP/InterfaceHandler.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/Message.hpp b/include/CommonAPI/SomeIP/Message.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/OutputStream.hpp b/include/CommonAPI/SomeIP/OutputStream.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/Proxy.hpp b/include/CommonAPI/SomeIP/Proxy.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/ProxyAsyncCallbackHandler.hpp b/include/CommonAPI/SomeIP/ProxyAsyncCallbackHandler.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.
@@ -75,9 +75,9 @@ class ProxyAsyncCallbackHandler: public ProxyConnection::MessageReplyAsyncHandle
             }
         }
 
-        //check if object is expired
-        if(!delegate_.object_.expired())
-            delegate_.function_(callStatus, std::move(std::get< ArgIndices_ >(argTuple_))...);
+        //ensure that delegate object (i.e Proxy) is not destroyed while callback function is invoked
+        if(auto itsDelegateObject = this->delegate_.object_.lock())
+            this->delegate_.function_(callStatus, std::move(std::get< ArgIndices_ >(argTuple_))...);
 
         return callStatus;
     }

diff --git a/include/CommonAPI/SomeIP/ProxyAsyncEventCallbackHandler.hpp b/include/CommonAPI/SomeIP/ProxyAsyncEventCallbackHandler.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.
@@ -57,9 +57,9 @@ class ProxyAsyncEventCallbackHandler: public ProxyConnection::MessageReplyAsyncH
     inline CallStatus handleMessageReply(const CallStatus callStatus, const Message& message) const {
         CallStatus status = callStatus;
 
-        //check if object is expired
-        if(!delegate_.object_.expired())
-            delegate_.function_(status, message, eventHandler_, tag_);
+        //ensure that delegate object (i.e Proxy) is not destroyed while callback function is invoked
+        if(auto itsDelegateObject = this->delegate_.object_.lock())
+            this->delegate_.function_(status, message, eventHandler_, tag_);
 
         return status;
     }

diff --git a/include/CommonAPI/SomeIP/ProxyBase.hpp b/include/CommonAPI/SomeIP/ProxyBase.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.
@@ -25,6 +25,7 @@ namespace CommonAPI {
 namespace SomeIP {
 
 class Address;
+class AddressTranslator;
 
 class COMMONAPI_EXPORT_CLASS_EXPLICIT ProxyBase
         : public virtual CommonAPI::Proxy {
@@ -87,6 +88,18 @@ class COMMONAPI_EXPORT_CLASS_EXPLICIT ProxyBase
              major_version_t major);
 
     COMMONAPI_EXPORT virtual bool init() = 0;
+
+    COMMONAPI_EXPORT void registerEvent(
+            service_id_t serviceId,
+            instance_id_t instanceId,
+            event_id_t eventId,
+            eventgroup_id_t eventGroupId,
+            bool isField);
+
+    COMMONAPI_EXPORT void unregisterEvent(
+            service_id_t serviceId,
+            instance_id_t instanceId,
+            event_id_t eventId);
  protected:
     const std::string commonApiDomain_;
 
@@ -97,6 +110,7 @@ class COMMONAPI_EXPORT_CLASS_EXPLICIT ProxyBase
 
     std::set<event_id_t> eventHandlerAdded_;
     std::mutex eventHandlerAddedMutex_;
+    std::shared_ptr<AddressTranslator> addressTranslator_;
 };
 
 const std::shared_ptr< ProxyConnection >& ProxyBase::getConnection() const {

diff --git a/include/CommonAPI/SomeIP/ProxyConnection.hpp b/include/CommonAPI/SomeIP/ProxyConnection.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.
@@ -144,7 +144,7 @@ class ProxyConnection {
     virtual void queueSelectiveErrorHandler(service_id_t serviceId,
                                           instance_id_t instanceId) = 0;
 
-    virtual void getInitialEvent(service_id_t serviceId,
+    virtual void subscribeForField(service_id_t serviceId,
                                  instance_id_t instanceId,
                                  eventgroup_id_t eventGroupId,
                                  event_id_t eventId,

diff --git a/include/CommonAPI/SomeIP/ProxyHelper.hpp b/include/CommonAPI/SomeIP/ProxyHelper.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/ProxyManager.hpp b/include/CommonAPI/SomeIP/ProxyManager.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.

diff --git a/include/CommonAPI/SomeIP/SelectiveEvent.hpp b/include/CommonAPI/SomeIP/SelectiveEvent.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2013-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// Copyright (C) 2013-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/.

diff --git a/include/CommonAPI/SomeIP/SerializableArguments.hpp b/include/CommonAPI/SomeIP/SerializableArguments.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)
+// 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/.