fix travis again

.travis.yml

@@ -57,11 +57,11 @@ script:
 - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 20
 - sudo update-alternatives --config gcc
 - echo "Compile multithreaded version"
-- cmake -DMULTITHREADING=ON -DEXAMPLESERVER=ON ..
+- cmake -DENABLE_MULTITHREADING=ON -DBUILD_EXAMPLESERVER=ON ..
 - make -j
 - cd .. && rm build -rf && mkdir -p build && cd build
 - echo "Documentation build"
-- cmake -DEXTENSION_STATELESS=ON -DGENERATE_DOCUMENTATION=ON ..
+- cmake -DEXTENSION_STATELESS=ON -DBUILD_DOCUMENTATION=ON ..
 - make -j
 - echo "Generate documentation"
 - make -j doc

src/server/ua_server_binary.c

@@ -160,7 +160,9 @@ static void init_response_header(const UA_RequestHeader *p, UA_ResponseHeader *r
 static void processMSG(UA_Connection *connection, UA_Server *server, const UA_ByteString *msg, size_t *pos) {
     // 1) Read in the securechannel
     UA_UInt32 secureChannelId;
-    UA_UInt32_decodeBinary(msg, pos, &secureChannelId);
+    UA_StatusCode retval = UA_UInt32_decodeBinary(msg, pos, &secureChannelId);
+    if(retval != UA_STATUSCODE_GOOD)
+        return;
 
     UA_SecureChannel *clientChannel = connection->channel;
     UA_SecureChannel anonymousChannel;
@@ -178,7 +180,7 @@ static void processMSG(UA_Connection *connection, UA_Server *server, const UA_By
     // 2) Read the security header
     UA_UInt32 tokenId;
     UA_SequenceHeader sequenceHeader;
-    UA_StatusCode retval = UA_UInt32_decodeBinary(msg, pos, &tokenId);
+    retval = UA_UInt32_decodeBinary(msg, pos, &tokenId);
     retval |= UA_SequenceHeader_decodeBinary(msg, pos, &sequenceHeader);
     if(retval != UA_STATUSCODE_GOOD)
         return;

tests/CMakeLists.txt

@@ -17,15 +17,11 @@ endif(MULTITHREADING)
 # the unit test are built directly on the open62541 object files. so they can
 # access symbols that are hidden/not exported to the shared library
 
-add_executable(check_builtin check_builtin.c ${PROJECT_SOURCE_DIR}/src/ua_types.c
-                                             ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.c
-                                             ${PROJECT_BINARY_DIR}/src_generated/ua_types_generated.c)
+add_executable(check_builtin check_builtin.c $<TARGET_OBJECTS:open62541-object>)
 target_link_libraries(check_builtin ${LIBS})
 add_test(builtin ${CMAKE_CURRENT_BINARY_DIR}/check_builtin)
 
-add_executable(check_memory check_memory.c ${PROJECT_SOURCE_DIR}/src/ua_types.c
-                                           ${PROJECT_SOURCE_DIR}/src/ua_types_encoding_binary.c
-                                           ${PROJECT_BINARY_DIR}/src_generated/ua_types_generated.c)
+add_executable(check_memory check_memory.c $<TARGET_OBJECTS:open62541-object>)
 target_link_libraries(check_memory ${LIBS})
 add_test(memory ${CMAKE_CURRENT_BINARY_DIR}/check_memory)
 
@@ -37,14 +33,11 @@ add_test(memory ${CMAKE_CURRENT_BINARY_DIR}/check_memory)
 # target_link_libraries(check_base64 ${LIBS})
 # add_test(base64 ${CMAKE_CURRENT_BINARY_DIR}/check_base64)
 
-add_executable(check_services_view check_services_view.c)
+add_executable(check_services_view check_services_view.c $<TARGET_OBJECTS:open62541-object>)
 target_link_libraries(check_services_view ${LIBS})
 add_test(services_view ${CMAKE_CURRENT_BINARY_DIR}/check_services_view)
 
-add_executable(check_nodestore check_nodestore.c ${PROJECT_SOURCE_DIR}/src/ua_types.c
-                                                 ${PROJECT_SOURCE_DIR}/src/server/ua_nodes.c
-                                                 ${PROJECT_SOURCE_DIR}/src/server/ua_nodestore.c
-                                                 ${PROJECT_BINARY_DIR}/src_generated/ua_types_generated.c)
+add_executable(check_nodestore check_nodestore.c $<TARGET_OBJECTS:open62541-object>)
 target_link_libraries(check_nodestore ${LIBS})
 add_test(nodestore ${CMAKE_CURRENT_BINARY_DIR}/check_nodestore)