Merge branch 'master' into trace-to-logs-on-all-platforms

documentation/vsomeipUserGuide

@@ -499,11 +499,13 @@ and less than or equal to "to" are matched.
 +
 *** 'type' (optional)
 +
-Specifies the filter type (valid values: "positive", "negative"). When a positive
-filter is used and a message matches one of the filter rules, the message will be
-traced/forwarded to DLT. With a negative filter messages can be excluded. So when a
-message matches one of the filter rules, the message will not be traced/forwarded to
-DLT. Default value is "positive".
+Specifies the filter type (valid values: "positive", "negative", "header-only"). 
+When a positive filter is used and a message matches one of the filter rules, 
+the message will be traced/forwarded to DLT. With a negative filter messages 
+can be excluded. So when a message matches one of the filter rules, the message 
+will not be traced/forwarded to DLT. Default value is "positive". The value
+"header-only" implies the filter is also considered "positive".
+
 +
 //Applications
 * 'applications (array)'

examples/hello_world/CMakeLists.txt

@@ -3,33 +3,37 @@
 # 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/.
 
-cmake_minimum_required (VERSION 2.8.7)
+cmake_minimum_required (VERSION 3.13)
 project (vSomeIPHelloWorld)
 
 find_package(Threads REQUIRED)
 
 set(VSOMEIP_NAME "vsomeip3")
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+# create_target("executable")
+function(create_target executable)
+    add_library(vsomeip_hello_world_${executable} INTERFACE)
+    target_sources(vsomeip_hello_world_${executable} INTERFACE
+        "${CMAKE_CURRENT_SOURCE_DIR}/hello_world_${executable}.hpp"
+    )
+    target_compile_features(vsomeip_hello_world_${executable} INTERFACE cxx_std_17)
+
+    target_include_directories(vsomeip_hello_world_${executable} INTERFACE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+endfunction()
+
+# link_target("executable")
+function(link_target executable)
+    add_executable(hello_world_${executable})
+    target_sources(hello_world_${executable} PRIVATE hello_world_${executable}_main.cpp)
+    target_link_libraries(hello_world_${executable} PRIVATE vsomeip_hello_world_${executable} vsomeip3 Threads::Threads)
+endfunction()
 
 include_directories(${VSOMEIP_INCLUDE_DIRS})
 
-add_library(vsomeip_hello_world_service INTERFACE)
-target_sources(vsomeip_hello_world_service INTERFACE
-    "${CMAKE_CURRENT_SOURCE_DIR}/hello_world_service.hpp"
-)
-target_include_directories(vsomeip_hello_world_service INTERFACE
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-)
-
-add_library(vsomeip_hello_world_client INTERFACE)
-target_sources(vsomeip_hello_world_client INTERFACE
-    "${CMAKE_CURRENT_SOURCE_DIR}/hello_world_client.hpp"
-)
-
-target_include_directories(vsomeip_hello_world_client INTERFACE
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-)
+create_target("service")
+create_target("client")
 
 if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android")
     # This will get us acces to
@@ -40,9 +44,6 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android")
         message("${VSOMEIP_NAME} was not found. Please specify vsomeip_DIR")
     endif()
 
-    add_executable (hello_world_service hello_world_service_main.cpp)
-    target_link_libraries(hello_world_service vsomeip_hello_world_service ${VSOMEIP_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-
-    add_executable (hello_world_client hello_world_client_main.cpp)
-    target_link_libraries(hello_world_client vsomeip_hello_world_client ${VSOMEIP_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+    link_target("client")
+    link_target("service")
 endif()

implementation/logger/src/message.cpp

@@ -26,7 +26,7 @@
 #endif
 
 #define ALOGW(LOG_TAG, ...) ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__))
-#ifndef LOGE
+#ifndef LOGW
 #define LOGW ALOGW
 #endif
 
@@ -35,7 +35,7 @@
 #endif
 
 #define ALOGI(LOG_TAG, ...) ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__))
-#ifndef LOGE
+#ifndef LOGI
 #define LOGI ALOGI
 #endif
 
@@ -44,7 +44,7 @@
 #endif
 
 #define ALOGD(LOG_TAG, ...) ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__))
-#ifndef LOGE
+#ifndef LOGD
 #define LOGD ALOGD
 #endif
 
@@ -53,7 +53,7 @@
 #endif
 
 #define ALOGV(LOG_TAG, ...) ((void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__))
-#ifndef LOGE
+#ifndef LOGV
 #define LOGV ALOGV
 #endif
 

implementation/tracing/src/connector_impl.cpp

@@ -255,7 +255,7 @@ void connector_impl::trace(const byte_t *_header, uint16_t _header_size,
                     ss << ' ' << std::setfill('0') << std::setw(2) << std::hex << int(_header[i]);
                 }
                 if (ftype.second)
-                    _data_size = VSOMEIP_FULL_HEADER_SIZE;
+                    its_data_size = VSOMEIP_FULL_HEADER_SIZE;
                 for(int i = 0; i < its_data_size; i++) {
                     ss << ' ' << std::setfill('0') << std::setw(2) << std::hex << int(_data[i]);
                 }

interface/vsomeip/application.hpp

@@ -571,7 +571,6 @@ class application {
      * availability shall be reported. Can be set to ANY_SERVICE.
      * \param _instance Instance identifier of the service instance whose
      * availability shall be reported. Can be set to ANY_INSTANCE.
-     * \param _handler Callback to be called if availability changes.
      * \param _major Major service version. The parameter defaults to
      * DEFAULT_MAJOR and can be set to ANY_MAJOR.
      * \param _minor Minor service version. The parameter defaults to