diff --git a/.gitignore b/.gitignore index 4ad53609..4f7b515a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ /cmake-* /build +build/ +examples/build/ .idea docs/build/ docs/source/doxyoutput/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 4dda3c8f..9be81b4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,9 +26,23 @@ if (WIN32) endif() endif() -add_subdirectory(src) +# Setup the include structure so that every file is based off of the root of the project +include_directories(src) + +# Actually add the source files for the project +add_subdirectory(src/${CMAKE_PROJECT_NAME}) + if (EXAMPLE_ENABLED) - add_subdirectory(examples) + set(EXAMPLES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/examples) + + # Create the build directory if it doesn't exist + file(MAKE_DIRECTORY ${EXAMPLES_DIR}/build) + + # Run the other CMakeLists.txt file without any dependencies on this file + execute_process(COMMAND ${CMAKE_COMMAND} ${EXAMPLES_DIR} WORKING_DIRECTORY ${EXAMPLES_DIR}/build) + + # Execute code during a `cmake --build` command + add_custom_target(EXAMPLES_TARGETS ALL COMMAND ${CMAKE_COMMAND} --build ${EXAMPLES_DIR}/build WORKING_DIRECTORY ${EXAMPLES_DIR}/build COMMENT "Building the examples sub-project") endif() if (TEST_ENABLED) @@ -38,5 +52,4 @@ endif() configure_file(EIPScanner.pc.in EIPScanner.pc @ONLY) -install(FILES ${CMAKE_BINARY_DIR}/EIPScanner.pc - DESTINATION lib/pkgconfig) +install(FILES ${CMAKE_BINARY_DIR}/EIPScanner.pc DESTINATION lib/pkgconfig) diff --git a/EIPScanner.pc.in b/EIPScanner.pc.in index 87f917de..308ea853 100644 --- a/EIPScanner.pc.in +++ b/EIPScanner.pc.in @@ -7,5 +7,5 @@ Name: @CMAKE_PROJECT_NAME@ Description: @CMAKE_PROJECT_DESCRIPTION@ URL: @CMAKE_PROJECT_HOMEPAGE_URL@ Version: @EIPSCANNER_FULL_VERSION@ -Cflags: -I"${includedir}" -I"${includedir}/@CMAKE_PROJECT_NAME@" +Cflags: -I"${includedir}" Libs: -L"${libdir}" -l@CMAKE_PROJECT_NAME@ diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 3142b74e..3a0148fc 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,25 +1,29 @@ -include_directories("${PROJECT_SOURCE_DIR}/src") +cmake_minimum_required(VERSION 3.5) + +# Remember to update the LIBRARY_PATH and LD_LIBRARY_PATH environment variables +# * export LIBRARY_PATH=/usr/local/include/ +# * export LD_LIBRARY_PATH=/usr/local/lib/ add_executable(explicit_messaging ExplicitMessagingExample.cpp) -target_link_libraries(explicit_messaging EIPScanner) +target_link_libraries(explicit_messaging PUBLIC EIPScanner) add_executable(file_object_example FileObjectExample.cpp) -target_link_libraries(file_object_example EIPScanner) +target_link_libraries(file_object_example PUBLIC EIPScanner) add_executable(identity_object_example IdentityObjectExample.cpp) -target_link_libraries(identity_object_example EIPScanner) +target_link_libraries(identity_object_example PUBLIC EIPScanner) add_executable(implicit_messaging ImplicitMessagingExample.cpp) -target_link_libraries(implicit_messaging EIPScanner) +target_link_libraries(implicit_messaging PUBLIC EIPScanner) add_executable(parameter_object_example ParameterObjectExample.cpp) -target_link_libraries(parameter_object_example EIPScanner) +target_link_libraries(parameter_object_example PUBLIC EIPScanner) add_executable(discovery_example DiscoveryManagerExample.cpp) -target_link_libraries(discovery_example EIPScanner) +target_link_libraries(discovery_example PUBLIC EIPScanner) add_executable(yaskawa_assembly_object_example vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp) -target_link_libraries(yaskawa_assembly_object_example EIPScanner) +target_link_libraries(yaskawa_assembly_object_example PUBLIC EIPScanner) if(WIN32) target_link_libraries(explicit_messaging ws2_32) diff --git a/examples/DiscoveryManagerExample.cpp b/examples/DiscoveryManagerExample.cpp index 915e00e9..d8af238a 100644 --- a/examples/DiscoveryManagerExample.cpp +++ b/examples/DiscoveryManagerExample.cpp @@ -7,8 +7,8 @@ #define OS_Windows (1) #endif -#include -#include +#include +#include using eipScanner::DiscoveryManager; using eipScanner::utils::Logger; diff --git a/examples/ExplicitMessagingExample.cpp b/examples/ExplicitMessagingExample.cpp index 6ae711f2..44915635 100644 --- a/examples/ExplicitMessagingExample.cpp +++ b/examples/ExplicitMessagingExample.cpp @@ -9,12 +9,12 @@ #include #include -#include -#include "SessionInfo.h" -#include "MessageRouter.h" -#include "ConnectionManager.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include +#include +#include +#include +#include +#include using namespace eipScanner::cip; using eipScanner::SessionInfo; diff --git a/examples/FileObjectExample.cpp b/examples/FileObjectExample.cpp index 27a40c78..220e7d53 100644 --- a/examples/FileObjectExample.cpp +++ b/examples/FileObjectExample.cpp @@ -8,9 +8,9 @@ #endif #include -#include "FileObject.h" -#include "utils/Logger.h" -#include "fileObject/FileObjectState.h" +#include +#include +#include using namespace eipScanner::cip; using eipScanner::SessionInfo; diff --git a/examples/IdentityObjectExample.cpp b/examples/IdentityObjectExample.cpp index e29c8e9e..755313c0 100644 --- a/examples/IdentityObjectExample.cpp +++ b/examples/IdentityObjectExample.cpp @@ -7,8 +7,8 @@ #define OS_Windows (1) #endif -#include "IdentityObject.h" -#include "utils/Logger.h" +#include +#include using eipScanner::IdentityObject; using eipScanner::SessionInfo; diff --git a/examples/ImplicitMessagingExample.cpp b/examples/ImplicitMessagingExample.cpp index a8b4d90b..fc24b54c 100644 --- a/examples/ImplicitMessagingExample.cpp +++ b/examples/ImplicitMessagingExample.cpp @@ -8,11 +8,11 @@ #endif #include -#include -#include "SessionInfo.h" -#include "ConnectionManager.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include +#include +#include +#include +#include using namespace eipScanner::cip; using eipScanner::SessionInfo; diff --git a/examples/ParameterObjectExample.cpp b/examples/ParameterObjectExample.cpp index 537b43c3..35177e91 100644 --- a/examples/ParameterObjectExample.cpp +++ b/examples/ParameterObjectExample.cpp @@ -7,9 +7,9 @@ #define OS_Windows (1) #endif -#include "ParameterObject.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include +#include +#include using namespace eipScanner::cip; using eipScanner::SessionInfo; diff --git a/examples/README.md b/examples/README.md new file mode 100644 index 00000000..c112314f --- /dev/null +++ b/examples/README.md @@ -0,0 +1,6 @@ +# Examples + +These examples use the installed library. + +Therefore the paths are `` rather than `"EIPScanner/..."` +* * The source files are linked in the `/usr/local/lib` shared object file \ No newline at end of file diff --git a/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp b/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp index 8cebde67..51deebef 100644 --- a/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp +++ b/examples/vendors/yaskawa/mp3300iec/Yaskawa_AssemblyObjectExample.cpp @@ -3,25 +3,26 @@ #define OS_Windows (1) #endif -#include "cip/Types.h" #include #include #include -#include -#include "ConnectionManager.h" -#include -#include "FileObject.h" -#include "fileObject/FileObjectState.h" -#include "IdentityObject.h" -#include "IOConnection.h" -#include "ParameterObject.h" -#include "SessionInfo.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" - -#include "vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" -#include "vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h" -#include "vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h" +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include using namespace eipScanner::cip; using eipScanner::ConnectionManager; diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index 6a581941..00000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,75 +0,0 @@ -include_directories(${CMAKE_CURRENT_LIST_DIR}) - -set(SOURCE_FILES - cip/connectionManager/ForwardCloseRequest.cpp - cip/connectionManager/ForwardOpenRequest.cpp - cip/connectionManager/LargeForwardOpenRequest.cpp - cip/connectionManager/ForwardOpenResponse.cpp - cip/connectionManager/NetworkConnectionParametersBuilder.cpp - - cip/CipRevision.cpp - cip/EPath.cpp - cip/MessageRouterRequest.cpp - cip/MessageRouterResponse.cpp - cip/CipString.cpp - - eip/CommonPacket.cpp - eip/CommonPacketItem.cpp - eip/CommonPacketItemFactory.cpp - eip/EncapsPacket.cpp - eip/EncapsPacketFactory.cpp - - fileObject/FileObjectEmptyState.cpp - fileObject/FileObjectLoadedState.cpp - fileObject/FileObjectNonExistentState.cpp - fileObject/FileObjectState.cpp - fileObject/FileObjectUploadInProgressState.cpp - - sockets/BaseSocket.cpp - sockets/EndPoint.cpp - sockets/TCPSocket.cpp - sockets/UDPBoundSocket.cpp - sockets/UDPSocket.cpp - sockets/Platform.cpp - - utils/Logger.cpp - utils/Buffer.cpp - - BaseObject.cpp - ConnectionManager.cpp - DiscoveryManager.cpp - FileObject.cpp - IdentityObject.cpp - IOConnection.cpp - MessageRouter.cpp - ParameterObject.cpp - SessionInfo.cpp) - -# if vendor scripts are enabled -if(ENABLE_VENDOR_SRC) - add_subdirectory(vendor) -endif() - -add_library(EIPScanner SHARED ${SOURCE_FILES} ${VENDOR_FILES}) -add_library(EIPScannerS STATIC ${SOURCE_FILES} ${VENDOR_FILES}) - -if(WIN32) - target_link_libraries(EIPScanner ws2_32) - target_link_libraries(EIPScannerS ws2_32) -endif() - -set_target_properties( - EIPScanner - PROPERTIES - VERSION ${EIPSCANNER_FULL_VERSION} - SOVERSION ${EIPSCANNER_MAJOR_VERSION}) - -install(TARGETS EIPScanner EIPScannerS - LIBRARY - DESTINATION lib - ARCHIVE - DESTINATION lib) - -install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ - DESTINATION include/EIPScanner - FILES_MATCHING PATTERN "*.h*") diff --git a/src/BaseObject.cpp b/src/EIPScanner/BaseObject.cpp similarity index 100% rename from src/BaseObject.cpp rename to src/EIPScanner/BaseObject.cpp diff --git a/src/BaseObject.h b/src/EIPScanner/BaseObject.h similarity index 95% rename from src/BaseObject.h rename to src/EIPScanner/BaseObject.h index b3748605..f94f42d5 100644 --- a/src/BaseObject.h +++ b/src/EIPScanner/BaseObject.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_BASEOBJECT_H #define EIPSCANNER_BASEOBJECT_H -#include "cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { /** diff --git a/src/EIPScanner/CMakeLists.txt b/src/EIPScanner/CMakeLists.txt new file mode 100644 index 00000000..637d35ff --- /dev/null +++ b/src/EIPScanner/CMakeLists.txt @@ -0,0 +1,51 @@ +# Add library target for common source files +set(SOURCE_FILES + BaseObject.cpp + ConnectionManager.cpp + DiscoveryManager.cpp + FileObject.cpp + IdentityObject.cpp + IOConnection.cpp + MessageRouter.cpp + ParameterObject.cpp + SessionInfo.cpp) + +add_library(EIPScanner SHARED ${SOURCE_FILES}) +add_library(EIPScannerS STATIC ${SOURCE_FILES}) + + +add_subdirectory(cip) +add_subdirectory(eip) +add_subdirectory(fileObject) +add_subdirectory(sockets) +add_subdirectory(utils) + + +# if vendor scripts are enabled +if(ENABLE_VENDOR_SRC) + add_subdirectory(vendor/ra) + add_subdirectory(vendor/yaskawa) +endif() + + +if(WIN32) + target_link_libraries(EIPScanner ws2_32) + target_link_libraries(EIPScannerS ws2_32) +endif() + + +set_target_properties( + EIPScanner + PROPERTIES + VERSION ${EIPSCANNER_FULL_VERSION} + SOVERSION ${EIPSCANNER_MAJOR_VERSION}) + +install(TARGETS EIPScanner EIPScannerS + LIBRARY + DESTINATION lib + ARCHIVE + DESTINATION lib) + +install(DIRECTORY ${PROJECT_SOURCE_DIR}/src/ + DESTINATION include + FILES_MATCHING PATTERN "*.h*") \ No newline at end of file diff --git a/src/ConnectionManager.cpp b/src/EIPScanner/ConnectionManager.cpp similarity index 94% rename from src/ConnectionManager.cpp rename to src/EIPScanner/ConnectionManager.cpp index a4c76a20..ee65c60b 100644 --- a/src/ConnectionManager.cpp +++ b/src/EIPScanner/ConnectionManager.cpp @@ -6,16 +6,16 @@ #include #include -#include "ConnectionManager.h" -#include "eip/CommonPacket.h" -#include "cip/connectionManager/ForwardOpenRequest.h" -#include "cip/connectionManager/ForwardCloseRequest.h" -#include "cip/connectionManager/LargeForwardOpenRequest.h" -#include "cip/connectionManager/ForwardOpenResponse.h" -#include "cip/connectionManager/NetworkConnectionParams.h" -#include "cip/connectionManager/NetworkConnectionParametersBuilder.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include "EIPScanner/ConnectionManager.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/cip/connectionManager/ForwardOpenRequest.h" +#include "EIPScanner/cip/connectionManager/ForwardCloseRequest.h" +#include "EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h" +#include "EIPScanner/cip/connectionManager/ForwardOpenResponse.h" +#include "EIPScanner/cip/connectionManager/NetworkConnectionParams.h" +#include "EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { using namespace cip::connectionManager; diff --git a/src/ConnectionManager.h b/src/EIPScanner/ConnectionManager.h similarity index 90% rename from src/ConnectionManager.h rename to src/EIPScanner/ConnectionManager.h index a317067a..e822a265 100644 --- a/src/ConnectionManager.h +++ b/src/EIPScanner/ConnectionManager.h @@ -6,12 +6,12 @@ #define EIPSCANNER_CONNECTIONMANAGER_H #include -#include "MessageRouter.h" -#include "IOConnection.h" -#include "cip/connectionManager/ConnectionParameters.h" -#include "cip/Services.h" -#include "cip/Types.h" -#include "sockets/UDPBoundSocket.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/IOConnection.h" +#include "EIPScanner/cip/connectionManager/ConnectionParameters.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/cip/Types.h" +#include "EIPScanner/sockets/UDPBoundSocket.h" namespace eipScanner { /** diff --git a/src/DiscoveryManager.cpp b/src/EIPScanner/DiscoveryManager.cpp similarity index 91% rename from src/DiscoveryManager.cpp rename to src/EIPScanner/DiscoveryManager.cpp index f8a118a6..4b06f5d0 100644 --- a/src/DiscoveryManager.cpp +++ b/src/EIPScanner/DiscoveryManager.cpp @@ -3,13 +3,13 @@ // #include -#include "eip/EncapsPacketFactory.h" -#include "eip/CommonPacket.h" -#include "sockets/UDPSocket.h" -#include "utils/Logger.h" -#include "utils/Buffer.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/sockets/UDPSocket.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/utils/Buffer.h" -#include "DiscoveryManager.h" +#include "EIPScanner/DiscoveryManager.h" namespace eipScanner { using namespace cip; diff --git a/src/DiscoveryManager.h b/src/EIPScanner/DiscoveryManager.h similarity index 95% rename from src/DiscoveryManager.h rename to src/EIPScanner/DiscoveryManager.h index ebfedb9a..bea587e1 100644 --- a/src/DiscoveryManager.h +++ b/src/EIPScanner/DiscoveryManager.h @@ -5,8 +5,8 @@ #ifndef EIPSCANNER_DISCOVERYMANAGER_H #define EIPSCANNER_DISCOVERYMANAGER_H -#include "IdentityObject.h" -#include "sockets/Platform.h" +#include "EIPScanner/IdentityObject.h" +#include "EIPScanner/sockets/Platform.h" #if defined (__unix__) || defined(__APPLE__) #define DISCOVERY_SOCKET_RECEIVE_END_ERROR_CODE (EIPSCANNER_SOCKET_ERROR(EAGAIN)) diff --git a/src/FileObject.cpp b/src/EIPScanner/FileObject.cpp similarity index 83% rename from src/FileObject.cpp rename to src/EIPScanner/FileObject.cpp index 5a451a3b..d8849177 100644 --- a/src/FileObject.cpp +++ b/src/EIPScanner/FileObject.cpp @@ -2,11 +2,11 @@ // Created by Aleksey Timin on 11/21/19. // #include -#include "FileObject.h" -#include "fileObject/FileObjectState.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" -#include "cip/Services.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/fileObject/FileObjectState.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/cip/Services.h" namespace eipScanner { using utils::Buffer; diff --git a/src/FileObject.h b/src/EIPScanner/FileObject.h similarity index 93% rename from src/FileObject.h rename to src/EIPScanner/FileObject.h index c48a4c06..e8158523 100644 --- a/src/FileObject.h +++ b/src/EIPScanner/FileObject.h @@ -7,10 +7,10 @@ #include -#include "cip/Types.h" -#include "cip/GeneralStatusCodes.h" -#include "MessageRouter.h" -#include "BaseObject.h" +#include "EIPScanner/cip/Types.h" +#include "EIPScanner/cip/GeneralStatusCodes.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/BaseObject.h" namespace eipScanner { namespace fileObject { diff --git a/src/IOConnection.cpp b/src/EIPScanner/IOConnection.cpp similarity index 93% rename from src/IOConnection.cpp rename to src/EIPScanner/IOConnection.cpp index 5571496f..77182c8a 100644 --- a/src/IOConnection.cpp +++ b/src/EIPScanner/IOConnection.cpp @@ -2,12 +2,12 @@ // Created by Aleksey Timin on 11/18/19. // -#include "IOConnection.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/CommonPacket.h" -#include "cip/connectionManager/NetworkConnectionParams.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" +#include "EIPScanner/IOConnection.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/cip/connectionManager/NetworkConnectionParams.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { using utils::Logger; diff --git a/src/IOConnection.h b/src/EIPScanner/IOConnection.h similarity index 97% rename from src/IOConnection.h rename to src/EIPScanner/IOConnection.h index 9058d893..8b9d5742 100644 --- a/src/IOConnection.h +++ b/src/EIPScanner/IOConnection.h @@ -8,8 +8,8 @@ #include #include #include -#include "cip/Types.h" -#include "sockets/UDPSocket.h" +#include "EIPScanner/cip/Types.h" +#include "EIPScanner/sockets/UDPSocket.h" namespace eipScanner { class ConnectionManager; diff --git a/src/IdentityObject.cpp b/src/EIPScanner/IdentityObject.cpp similarity index 97% rename from src/IdentityObject.cpp rename to src/EIPScanner/IdentityObject.cpp index 0e771c9c..54b05f04 100644 --- a/src/IdentityObject.cpp +++ b/src/EIPScanner/IdentityObject.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 12/8/19. // -#include "IdentityObject.h" -#include "utils/Buffer.h" +#include "EIPScanner/IdentityObject.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { using namespace cip; diff --git a/src/IdentityObject.h b/src/EIPScanner/IdentityObject.h similarity index 93% rename from src/IdentityObject.h rename to src/EIPScanner/IdentityObject.h index cd4cc0b1..f945e5f7 100644 --- a/src/IdentityObject.h +++ b/src/EIPScanner/IdentityObject.h @@ -5,12 +5,12 @@ #ifndef EIPSCANNER_IDENTITYOBJECT_H #define EIPSCANNER_IDENTITYOBJECT_H -#include "cip/CipString.h" -#include "cip/CipRevision.h" -#include "cip/Types.h" -#include "SessionInfo.h" -#include "MessageRouter.h" -#include "BaseObject.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/cip/CipRevision.h" +#include "EIPScanner/cip/Types.h" +#include "EIPScanner/SessionInfo.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/BaseObject.h" namespace eipScanner { /** diff --git a/src/MessageRouter.cpp b/src/EIPScanner/MessageRouter.cpp similarity index 82% rename from src/MessageRouter.cpp rename to src/EIPScanner/MessageRouter.cpp index 16f2232f..7f863954 100644 --- a/src/MessageRouter.cpp +++ b/src/EIPScanner/MessageRouter.cpp @@ -3,15 +3,15 @@ // #include -#include "eip/EncapsPacketFactory.h" -#include "utils/Buffer.h" -#include "MessageRouter.h" -#include "cip/MessageRouterRequest.h" -#include "cip/MessageRouterResponse.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/CommonPacket.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/cip/MessageRouterRequest.h" +#include "EIPScanner/cip/MessageRouterResponse.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { using namespace cip; @@ -40,7 +40,7 @@ namespace eipScanner { const std::vector& additionalPacketItems) const { assert(si); - Logger(LogLevel::INFO) << "Send request: service=0x" << std::hex << static_cast(service) + Logger(LogLevel::DEBUG) << "Send request: service=0x" << std::hex << static_cast(service) << " epath=" << path.toString(); MessageRouterRequest request{service, path, data, _use_8_bit_path_segments}; diff --git a/src/MessageRouter.h b/src/EIPScanner/MessageRouter.h similarity index 93% rename from src/MessageRouter.h rename to src/EIPScanner/MessageRouter.h index c4a0bdad..a5cecb89 100644 --- a/src/MessageRouter.h +++ b/src/EIPScanner/MessageRouter.h @@ -6,11 +6,11 @@ #define EIPSCANNER_MESSAGEROUTER_H #include -#include "cip/EPath.h" -#include "cip/Services.h" -#include "cip/MessageRouterResponse.h" -#include "eip/CommonPacketItem.h" -#include "SessionInfo.h" +#include "EIPScanner/cip/EPath.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/cip/MessageRouterResponse.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/SessionInfo.h" namespace eipScanner { /** diff --git a/src/ParameterObject.cpp b/src/EIPScanner/ParameterObject.cpp similarity index 98% rename from src/ParameterObject.cpp rename to src/EIPScanner/ParameterObject.cpp index adc702be..bce429e4 100644 --- a/src/ParameterObject.cpp +++ b/src/EIPScanner/ParameterObject.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 12/4/19. // -#include "ParameterObject.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" +#include "EIPScanner/ParameterObject.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { using utils::Buffer; diff --git a/src/ParameterObject.h b/src/EIPScanner/ParameterObject.h similarity index 98% rename from src/ParameterObject.h rename to src/EIPScanner/ParameterObject.h index c338f24c..66f4252a 100644 --- a/src/ParameterObject.h +++ b/src/EIPScanner/ParameterObject.h @@ -7,9 +7,9 @@ #include #include -#include "MessageRouter.h" -#include "utils/Buffer.h" -#include "BaseObject.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/BaseObject.h" namespace eipScanner { diff --git a/src/SessionInfo.cpp b/src/EIPScanner/SessionInfo.cpp similarity index 92% rename from src/SessionInfo.cpp rename to src/EIPScanner/SessionInfo.cpp index cbfb1791..de8710d4 100644 --- a/src/SessionInfo.cpp +++ b/src/EIPScanner/SessionInfo.cpp @@ -4,10 +4,10 @@ -#include "SessionInfo.h" -#include "utils/Logger.h" -#include "eip/EncapsPacket.h" -#include "eip/EncapsPacketFactory.h" +#include "EIPScanner/SessionInfo.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/eip/EncapsPacket.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" namespace eipScanner { diff --git a/src/SessionInfo.h b/src/EIPScanner/SessionInfo.h similarity index 95% rename from src/SessionInfo.h rename to src/EIPScanner/SessionInfo.h index 313abe6f..dfd9285b 100644 --- a/src/SessionInfo.h +++ b/src/EIPScanner/SessionInfo.h @@ -10,8 +10,8 @@ #include #include -#include "SessionInfoIf.h" -#include "sockets/TCPSocket.h" +#include "EIPScanner/SessionInfoIf.h" +#include "EIPScanner/sockets/TCPSocket.h" namespace eipScanner { /** diff --git a/src/SessionInfoIf.h b/src/EIPScanner/SessionInfoIf.h similarity index 91% rename from src/SessionInfoIf.h rename to src/EIPScanner/SessionInfoIf.h index 974a7e5e..eba4efb8 100644 --- a/src/SessionInfoIf.h +++ b/src/EIPScanner/SessionInfoIf.h @@ -6,8 +6,8 @@ #define EIPSCANNER_SESSIONINFOIF_H #include -#include "eip/EncapsPacket.h" -#include "sockets/EndPoint.h" +#include "EIPScanner/eip/EncapsPacket.h" +#include "EIPScanner/sockets/EndPoint.h" namespace eipScanner { /** diff --git a/src/EIPScanner/cip/CMakeLists.txt b/src/EIPScanner/cip/CMakeLists.txt new file mode 100644 index 00000000..7c616cef --- /dev/null +++ b/src/EIPScanner/cip/CMakeLists.txt @@ -0,0 +1,12 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/CipRevision.cpp + ${CMAKE_CURRENT_LIST_DIR}/EPath.cpp + ${CMAKE_CURRENT_LIST_DIR}/MessageRouterRequest.cpp + ${CMAKE_CURRENT_LIST_DIR}/MessageRouterResponse.cpp + ${CMAKE_CURRENT_LIST_DIR}/CipString.cpp) + + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScannerS PUBLIC ${SOURCE_FILES}) + +add_subdirectory(connectionManager) \ No newline at end of file diff --git a/src/cip/CipRevision.cpp b/src/EIPScanner/cip/CipRevision.cpp similarity index 94% rename from src/cip/CipRevision.cpp rename to src/EIPScanner/cip/CipRevision.cpp index 466940a4..5894ad50 100644 --- a/src/cip/CipRevision.cpp +++ b/src/EIPScanner/cip/CipRevision.cpp @@ -2,7 +2,8 @@ // Created by Aleksey Timin on 12/8/19. // -#include "CipRevision.h" +#include "EIPScanner/cip/CipRevision.h" + namespace eipScanner { namespace cip { diff --git a/src/cip/CipRevision.h b/src/EIPScanner/cip/CipRevision.h similarity index 94% rename from src/cip/CipRevision.h rename to src/EIPScanner/cip/CipRevision.h index da1f1d35..17bcdc98 100644 --- a/src/cip/CipRevision.h +++ b/src/EIPScanner/cip/CipRevision.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CIPREVISION_H #include -#include "Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/CipString.cpp b/src/EIPScanner/cip/CipString.cpp similarity index 70% rename from src/cip/CipString.cpp rename to src/EIPScanner/cip/CipString.cpp index f7347161..2567d0b0 100644 --- a/src/cip/CipString.cpp +++ b/src/EIPScanner/cip/CipString.cpp @@ -2,7 +2,8 @@ // Created by Aleksey Timin on 12/4/19. // -#include "CipString.h" +#include "EIPScanner/cip/CipString.h" + namespace eipScanner { namespace cip { diff --git a/src/cip/CipString.h b/src/EIPScanner/cip/CipString.h similarity index 96% rename from src/cip/CipString.h rename to src/EIPScanner/cip/CipString.h index 1cdc713e..0f8f8b59 100644 --- a/src/cip/CipString.h +++ b/src/EIPScanner/cip/CipString.h @@ -9,7 +9,7 @@ #include #include #include -#include "Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/EPath.cpp b/src/EIPScanner/cip/EPath.cpp similarity index 98% rename from src/cip/EPath.cpp rename to src/EIPScanner/cip/EPath.cpp index 447ef301..b868adb6 100644 --- a/src/cip/EPath.cpp +++ b/src/EIPScanner/cip/EPath.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "utils/Buffer.h" -#include "EPath.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/cip/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/EPath.h b/src/EIPScanner/cip/EPath.h similarity index 96% rename from src/cip/EPath.h rename to src/EIPScanner/cip/EPath.h index d2270b6e..b75eb93f 100644 --- a/src/cip/EPath.h +++ b/src/EIPScanner/cip/EPath.h @@ -9,7 +9,7 @@ #include #include -#include "Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/GeneralStatusCodes.h b/src/EIPScanner/cip/GeneralStatusCodes.h similarity index 99% rename from src/cip/GeneralStatusCodes.h rename to src/EIPScanner/cip/GeneralStatusCodes.h index 810f6e31..1c7a665e 100644 --- a/src/cip/GeneralStatusCodes.h +++ b/src/EIPScanner/cip/GeneralStatusCodes.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_GENERALSTATUSCODES_H #define EIPSCANNER_CIP_GENERALSTATUSCODES_H -#include "Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterRequest.cpp b/src/EIPScanner/cip/MessageRouterRequest.cpp similarity index 85% rename from src/cip/MessageRouterRequest.cpp rename to src/EIPScanner/cip/MessageRouterRequest.cpp index 43e5ab79..592257ea 100644 --- a/src/cip/MessageRouterRequest.cpp +++ b/src/EIPScanner/cip/MessageRouterRequest.cpp @@ -2,9 +2,10 @@ // Created by Aleksey Timin on 11/16/19. // -#include -#include "MessageRouterRequest.h" -#include "EPath.h" +#include "EIPScanner/utils/Buffer.h" + +#include "EIPScanner/cip/MessageRouterRequest.h" +#include "EIPScanner/cip/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterRequest.h b/src/EIPScanner/cip/MessageRouterRequest.h similarity index 89% rename from src/cip/MessageRouterRequest.h rename to src/EIPScanner/cip/MessageRouterRequest.h index 09777b7f..0531ca62 100644 --- a/src/cip/MessageRouterRequest.h +++ b/src/EIPScanner/cip/MessageRouterRequest.h @@ -8,8 +8,8 @@ #include #include -#include "Services.h" -#include "EPath.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/cip/EPath.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterResponse.cpp b/src/EIPScanner/cip/MessageRouterResponse.cpp similarity index 95% rename from src/cip/MessageRouterResponse.cpp rename to src/EIPScanner/cip/MessageRouterResponse.cpp index 5b56cc83..5af3717a 100644 --- a/src/cip/MessageRouterResponse.cpp +++ b/src/EIPScanner/cip/MessageRouterResponse.cpp @@ -2,9 +2,11 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "MessageRouterResponse.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" + +#include "EIPScanner/cip/MessageRouterResponse.h" + +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { namespace cip { diff --git a/src/cip/MessageRouterResponse.h b/src/EIPScanner/cip/MessageRouterResponse.h similarity index 90% rename from src/cip/MessageRouterResponse.h rename to src/EIPScanner/cip/MessageRouterResponse.h index b2c7d672..9311f49b 100644 --- a/src/cip/MessageRouterResponse.h +++ b/src/EIPScanner/cip/MessageRouterResponse.h @@ -8,9 +8,10 @@ #include #include -#include "GeneralStatusCodes.h" -#include "Services.h" -#include "eip/CommonPacketItem.h" +#include "EIPScanner/cip/GeneralStatusCodes.h" + +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/eip/CommonPacketItem.h" namespace eipScanner { namespace cip { diff --git a/src/cip/Services.h b/src/EIPScanner/cip/Services.h similarity index 96% rename from src/cip/Services.h rename to src/EIPScanner/cip/Services.h index a2c91ca2..32032db0 100644 --- a/src/cip/Services.h +++ b/src/EIPScanner/cip/Services.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_SERVICES_H #define EIPSCANNER_CIP_SERVICES_H -#include "Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/Types.h b/src/EIPScanner/cip/Types.h similarity index 100% rename from src/cip/Types.h rename to src/EIPScanner/cip/Types.h diff --git a/src/EIPScanner/cip/connectionManager/CMakeLists.txt b/src/EIPScanner/cip/connectionManager/CMakeLists.txt new file mode 100644 index 00000000..190ac537 --- /dev/null +++ b/src/EIPScanner/cip/connectionManager/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/ForwardCloseRequest.cpp + ${CMAKE_CURRENT_LIST_DIR}/ForwardOpenRequest.cpp + ${CMAKE_CURRENT_LIST_DIR}/LargeForwardOpenRequest.cpp + ${CMAKE_CURRENT_LIST_DIR}/ForwardOpenResponse.cpp + ${CMAKE_CURRENT_LIST_DIR}/NetworkConnectionParametersBuilder.cpp) + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScannerS PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/cip/connectionManager/ConnectionParameters.h b/src/EIPScanner/cip/connectionManager/ConnectionParameters.h similarity index 96% rename from src/cip/connectionManager/ConnectionParameters.h rename to src/EIPScanner/cip/connectionManager/ConnectionParameters.h index c1ba86db..83db80f1 100644 --- a/src/cip/connectionManager/ConnectionParameters.h +++ b/src/EIPScanner/cip/connectionManager/ConnectionParameters.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_CONNECTIONPARAMETERS_H #define EIPSCANNER_CIP_CONNECTIONPARAMETERS_H -#include "cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardCloseRequest.cpp b/src/EIPScanner/cip/connectionManager/ForwardCloseRequest.cpp similarity index 93% rename from src/cip/connectionManager/ForwardCloseRequest.cpp rename to src/EIPScanner/cip/connectionManager/ForwardCloseRequest.cpp index 4134f80c..534ca5be 100644 --- a/src/cip/connectionManager/ForwardCloseRequest.cpp +++ b/src/EIPScanner/cip/connectionManager/ForwardCloseRequest.cpp @@ -1,8 +1,8 @@ // // Created by Aleksey Timin on 11/19/19. // -#include "ForwardCloseRequest.h" -#include "utils/Buffer.h" +#include "EIPScanner/cip/connectionManager/ForwardCloseRequest.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardCloseRequest.h b/src/EIPScanner/cip/connectionManager/ForwardCloseRequest.h similarity index 92% rename from src/cip/connectionManager/ForwardCloseRequest.h rename to src/EIPScanner/cip/connectionManager/ForwardCloseRequest.h index bbbd872a..7dea89c0 100644 --- a/src/cip/connectionManager/ForwardCloseRequest.h +++ b/src/EIPScanner/cip/connectionManager/ForwardCloseRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDCLOSEREQUEST_H #include -#include "ConnectionParameters.h" +#include "EIPScanner/cip/connectionManager/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenRequest.cpp b/src/EIPScanner/cip/connectionManager/ForwardOpenRequest.cpp similarity index 93% rename from src/cip/connectionManager/ForwardOpenRequest.cpp rename to src/EIPScanner/cip/connectionManager/ForwardOpenRequest.cpp index a48d9cc1..c01dd173 100644 --- a/src/cip/connectionManager/ForwardOpenRequest.cpp +++ b/src/EIPScanner/cip/connectionManager/ForwardOpenRequest.cpp @@ -2,11 +2,11 @@ // Created by Aleksey Timin on 11/18/19. // -#include "ForwardOpenRequest.h" +#include "EIPScanner/cip/connectionManager/ForwardOpenRequest.h" #include #include -#include "utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenRequest.h b/src/EIPScanner/cip/connectionManager/ForwardOpenRequest.h similarity index 89% rename from src/cip/connectionManager/ForwardOpenRequest.h rename to src/EIPScanner/cip/connectionManager/ForwardOpenRequest.h index e999a0d6..32f0f8dc 100644 --- a/src/cip/connectionManager/ForwardOpenRequest.h +++ b/src/EIPScanner/cip/connectionManager/ForwardOpenRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDOPENREQUEST_H #include -#include "ConnectionParameters.h" +#include "EIPScanner/cip/connectionManager/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenResponse.cpp b/src/EIPScanner/cip/connectionManager/ForwardOpenResponse.cpp similarity index 94% rename from src/cip/connectionManager/ForwardOpenResponse.cpp rename to src/EIPScanner/cip/connectionManager/ForwardOpenResponse.cpp index 622c1d19..5f431a92 100644 --- a/src/cip/connectionManager/ForwardOpenResponse.cpp +++ b/src/EIPScanner/cip/connectionManager/ForwardOpenResponse.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/18/19. // -#include "ForwardOpenResponse.h" -#include "utils/Buffer.h" +#include "EIPScanner/cip/connectionManager/ForwardOpenResponse.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/ForwardOpenResponse.h b/src/EIPScanner/cip/connectionManager/ForwardOpenResponse.h similarity index 97% rename from src/cip/connectionManager/ForwardOpenResponse.h rename to src/EIPScanner/cip/connectionManager/ForwardOpenResponse.h index d70d3342..0de20fc0 100644 --- a/src/cip/connectionManager/ForwardOpenResponse.h +++ b/src/EIPScanner/cip/connectionManager/ForwardOpenResponse.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_FORWARDOPENRESPONSE_H #include -#include "cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/LargeForwardOpenRequest.cpp b/src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.cpp similarity index 92% rename from src/cip/connectionManager/LargeForwardOpenRequest.cpp rename to src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.cpp index 45da36ac..37e02dac 100644 --- a/src/cip/connectionManager/LargeForwardOpenRequest.cpp +++ b/src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.cpp @@ -2,11 +2,11 @@ // Created by Vincent Prince on 05/22/20. // -#include "LargeForwardOpenRequest.h" +#include "EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h" #include #include -#include "utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/LargeForwardOpenRequest.h b/src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h similarity index 89% rename from src/cip/connectionManager/LargeForwardOpenRequest.h rename to src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h index c1f0a87f..9e0274b0 100644 --- a/src/cip/connectionManager/LargeForwardOpenRequest.h +++ b/src/EIPScanner/cip/connectionManager/LargeForwardOpenRequest.h @@ -6,7 +6,7 @@ #define EIPSCANNER_CIP_CONNECTIONMANAGER_LARGEFORWARDOPENREQUEST_H #include -#include "ConnectionParameters.h" +#include "EIPScanner/cip/connectionManager/ConnectionParameters.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp b/src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.cpp similarity index 96% rename from src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp rename to src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.cpp index 219a191d..b0bc2da6 100644 --- a/src/cip/connectionManager/NetworkConnectionParametersBuilder.cpp +++ b/src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.cpp @@ -2,11 +2,11 @@ // Created by Vincent Prince on 05/22/20. // -#include "NetworkConnectionParametersBuilder.h" +#include "EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h" #include #include -#include "utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParametersBuilder.h b/src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h similarity index 97% rename from src/cip/connectionManager/NetworkConnectionParametersBuilder.h rename to src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h index ba091fac..09a1ecd0 100644 --- a/src/cip/connectionManager/NetworkConnectionParametersBuilder.h +++ b/src/EIPScanner/cip/connectionManager/NetworkConnectionParametersBuilder.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMETERSBUILDER_H #define EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMETERSBUILDER_H -#include "cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/cip/connectionManager/NetworkConnectionParams.h b/src/EIPScanner/cip/connectionManager/NetworkConnectionParams.h similarity index 96% rename from src/cip/connectionManager/NetworkConnectionParams.h rename to src/EIPScanner/cip/connectionManager/NetworkConnectionParams.h index e6cb8b9d..7e3e4078 100644 --- a/src/cip/connectionManager/NetworkConnectionParams.h +++ b/src/EIPScanner/cip/connectionManager/NetworkConnectionParams.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMS_H #define EIPSCANNER_CIP_CONNECTIONMANAGER_NETWORKCONNECTIONPARAMS_H -#include "cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace cip { diff --git a/src/EIPScanner/eip/CMakeLists.txt b/src/EIPScanner/eip/CMakeLists.txt new file mode 100644 index 00000000..115b5541 --- /dev/null +++ b/src/EIPScanner/eip/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/CommonPacket.cpp + ${CMAKE_CURRENT_LIST_DIR}/CommonPacketItem.cpp + ${CMAKE_CURRENT_LIST_DIR}/CommonPacketItemFactory.cpp + ${CMAKE_CURRENT_LIST_DIR}/EncapsPacket.cpp + ${CMAKE_CURRENT_LIST_DIR}/EncapsPacketFactory.cpp) + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScannerS PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/eip/CommonPacket.cpp b/src/EIPScanner/eip/CommonPacket.cpp similarity index 91% rename from src/eip/CommonPacket.cpp rename to src/EIPScanner/eip/CommonPacket.cpp index c51a176b..b4626fda 100644 --- a/src/eip/CommonPacket.cpp +++ b/src/EIPScanner/eip/CommonPacket.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "CommonPacket.h" -#include "utils/Buffer.h" -#include "cip/Types.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacket.h b/src/EIPScanner/eip/CommonPacket.h similarity index 92% rename from src/eip/CommonPacket.h rename to src/EIPScanner/eip/CommonPacket.h index a4ed8149..f6ac3779 100644 --- a/src/eip/CommonPacket.h +++ b/src/EIPScanner/eip/CommonPacket.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_EIP_COMMONPACKET_H #define EIPSCANNER_EIP_COMMONPACKET_H -#include "CommonPacketItem.h" +#include "EIPScanner/eip/CommonPacketItem.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItem.cpp b/src/EIPScanner/eip/CommonPacketItem.cpp similarity index 93% rename from src/eip/CommonPacketItem.cpp rename to src/EIPScanner/eip/CommonPacketItem.cpp index b716cafe..fd86c78e 100644 --- a/src/eip/CommonPacketItem.cpp +++ b/src/EIPScanner/eip/CommonPacketItem.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // -#include "utils/Buffer.h" -#include "CommonPacketItem.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/eip/CommonPacketItem.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItem.h b/src/EIPScanner/eip/CommonPacketItem.h similarity index 97% rename from src/eip/CommonPacketItem.h rename to src/EIPScanner/eip/CommonPacketItem.h index 000bba6e..9413d656 100644 --- a/src/eip/CommonPacketItem.h +++ b/src/EIPScanner/eip/CommonPacketItem.h @@ -8,7 +8,7 @@ #include #include -#include "cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItemFactory.cpp b/src/EIPScanner/eip/CommonPacketItemFactory.cpp similarity index 90% rename from src/eip/CommonPacketItemFactory.cpp rename to src/EIPScanner/eip/CommonPacketItemFactory.cpp index 40f0d8a9..30221550 100644 --- a/src/eip/CommonPacketItemFactory.cpp +++ b/src/EIPScanner/eip/CommonPacketItemFactory.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // -#include "CommonPacketItemFactory.h" -#include "utils/Buffer.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace eip { diff --git a/src/eip/CommonPacketItemFactory.h b/src/EIPScanner/eip/CommonPacketItemFactory.h similarity index 88% rename from src/eip/CommonPacketItemFactory.h rename to src/EIPScanner/eip/CommonPacketItemFactory.h index 98a5b63c..2289c571 100644 --- a/src/eip/CommonPacketItemFactory.h +++ b/src/EIPScanner/eip/CommonPacketItemFactory.h @@ -6,8 +6,8 @@ #define EIPSCANNER_EIP_COMMONPACKETITEMFACTORY_H #include -#include "CommonPacketItem.h" -#include "cip/Types.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacket.cpp b/src/EIPScanner/eip/EncapsPacket.cpp similarity index 97% rename from src/eip/EncapsPacket.cpp rename to src/EIPScanner/eip/EncapsPacket.cpp index 64d2ed3e..091517b1 100644 --- a/src/eip/EncapsPacket.cpp +++ b/src/EIPScanner/eip/EncapsPacket.cpp @@ -4,8 +4,8 @@ #include #include -#include "EncapsPacket.h" -#include "utils/Buffer.h" +#include "EIPScanner/eip/EncapsPacket.h" +#include "EIPScanner/utils/Buffer.h" using eipScanner::utils::Buffer; diff --git a/src/eip/EncapsPacket.h b/src/EIPScanner/eip/EncapsPacket.h similarity index 97% rename from src/eip/EncapsPacket.h rename to src/EIPScanner/eip/EncapsPacket.h index 1d39ba17..e1db9177 100644 --- a/src/eip/EncapsPacket.h +++ b/src/EIPScanner/eip/EncapsPacket.h @@ -9,8 +9,7 @@ #include #include -#include "cip/Types.h" -#include +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacketFactory.cpp b/src/EIPScanner/eip/EncapsPacketFactory.cpp similarity index 94% rename from src/eip/EncapsPacketFactory.cpp rename to src/EIPScanner/eip/EncapsPacketFactory.cpp index 56d70279..392c675b 100644 --- a/src/eip/EncapsPacketFactory.cpp +++ b/src/EIPScanner/eip/EncapsPacketFactory.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // -#include -#include "EncapsPacketFactory.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" namespace eipScanner { namespace eip { diff --git a/src/eip/EncapsPacketFactory.h b/src/EIPScanner/eip/EncapsPacketFactory.h similarity index 88% rename from src/eip/EncapsPacketFactory.h rename to src/EIPScanner/eip/EncapsPacketFactory.h index 163077eb..1e10e869 100644 --- a/src/eip/EncapsPacketFactory.h +++ b/src/EIPScanner/eip/EncapsPacketFactory.h @@ -5,8 +5,8 @@ #ifndef EIPSCANNER_EIP_ENCAPSPACKETFACTORY_H #define EIPSCANNER_EIP_ENCAPSPACKETFACTORY_H -#include "EncapsPacket.h" -#include "cip/Types.h" +#include "EIPScanner/eip/EncapsPacket.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace eip { diff --git a/src/EIPScanner/fileObject/CMakeLists.txt b/src/EIPScanner/fileObject/CMakeLists.txt new file mode 100644 index 00000000..24cc0ea1 --- /dev/null +++ b/src/EIPScanner/fileObject/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/FileObjectEmptyState.cpp + ${CMAKE_CURRENT_LIST_DIR}/FileObjectLoadedState.cpp + ${CMAKE_CURRENT_LIST_DIR}/FileObjectNonExistentState.cpp + ${CMAKE_CURRENT_LIST_DIR}/FileObjectState.cpp + ${CMAKE_CURRENT_LIST_DIR}/FileObjectUploadInProgressState.cpp) + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScannerS PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/fileObject/FileObjectEmptyState.cpp b/src/EIPScanner/fileObject/FileObjectEmptyState.cpp similarity index 92% rename from src/fileObject/FileObjectEmptyState.cpp rename to src/EIPScanner/fileObject/FileObjectEmptyState.cpp index a2344851..2820e9bb 100644 --- a/src/fileObject/FileObjectEmptyState.cpp +++ b/src/EIPScanner/fileObject/FileObjectEmptyState.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/23/19. // -#include "FileObjectEmptyState.h" +#include "EIPScanner/fileObject/FileObjectEmptyState.h" namespace eipScanner { namespace fileObject { using utils::LogLevel; diff --git a/src/fileObject/FileObjectEmptyState.h b/src/EIPScanner/fileObject/FileObjectEmptyState.h similarity index 91% rename from src/fileObject/FileObjectEmptyState.h rename to src/EIPScanner/fileObject/FileObjectEmptyState.h index 284657c6..f1f9508d 100644 --- a/src/fileObject/FileObjectEmptyState.h +++ b/src/EIPScanner/fileObject/FileObjectEmptyState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTEMPTYSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTEMPTYSTATE_H -#include "FileObjectState.h" +#include "EIPScanner/fileObject/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectLoadedState.cpp b/src/EIPScanner/fileObject/FileObjectLoadedState.cpp similarity index 88% rename from src/fileObject/FileObjectLoadedState.cpp rename to src/EIPScanner/fileObject/FileObjectLoadedState.cpp index f078943b..ea3ce3b0 100644 --- a/src/fileObject/FileObjectLoadedState.cpp +++ b/src/EIPScanner/fileObject/FileObjectLoadedState.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 11/23/19. // -#include "FileObjectLoadedState.h" -#include "FileObjectUploadInProgressState.h" -#include "utils/Buffer.h" +#include "EIPScanner/fileObject/FileObjectLoadedState.h" +#include "EIPScanner/fileObject/FileObjectUploadInProgressState.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectLoadedState.h b/src/EIPScanner/fileObject/FileObjectLoadedState.h similarity index 91% rename from src/fileObject/FileObjectLoadedState.h rename to src/EIPScanner/fileObject/FileObjectLoadedState.h index 26086e85..58153e1a 100644 --- a/src/fileObject/FileObjectLoadedState.h +++ b/src/EIPScanner/fileObject/FileObjectLoadedState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTLOADEDSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTLOADEDSTATE_H -#include "FileObjectState.h" +#include "EIPScanner/fileObject/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectNonExistentState.cpp b/src/EIPScanner/fileObject/FileObjectNonExistentState.cpp similarity index 92% rename from src/fileObject/FileObjectNonExistentState.cpp rename to src/EIPScanner/fileObject/FileObjectNonExistentState.cpp index 62152696..9f4fad81 100644 --- a/src/fileObject/FileObjectNonExistentState.cpp +++ b/src/EIPScanner/fileObject/FileObjectNonExistentState.cpp @@ -2,7 +2,7 @@ // Created by Aleksey Timin on 11/23/19. // -#include "FileObjectNonExistentState.h" +#include "EIPScanner/fileObject/FileObjectNonExistentState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectNonExistentState.h b/src/EIPScanner/fileObject/FileObjectNonExistentState.h similarity index 91% rename from src/fileObject/FileObjectNonExistentState.h rename to src/EIPScanner/fileObject/FileObjectNonExistentState.h index 6d63b098..69e22de0 100644 --- a/src/fileObject/FileObjectNonExistentState.h +++ b/src/EIPScanner/fileObject/FileObjectNonExistentState.h @@ -5,7 +5,7 @@ #ifndef EIPSCANNER_FILEOBJECT_FILEOBJECTNONEXISTENTSTATE_H #define EIPSCANNER_FILEOBJECT_FILEOBJECTNONEXISTENTSTATE_H -#include "FileObjectState.h" +#include "EIPScanner/fileObject/FileObjectState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectState.cpp b/src/EIPScanner/fileObject/FileObjectState.cpp similarity index 91% rename from src/fileObject/FileObjectState.cpp rename to src/EIPScanner/fileObject/FileObjectState.cpp index 84d4bc2f..a22c6105 100644 --- a/src/fileObject/FileObjectState.cpp +++ b/src/EIPScanner/fileObject/FileObjectState.cpp @@ -3,12 +3,12 @@ // #include -#include "FileObjectState.h" -#include "utils/Buffer.h" -#include "FileObjectNonExistentState.h" -#include "FileObjectEmptyState.h" -#include "FileObjectLoadedState.h" -#include "FileObjectUploadInProgressState.h" +#include "EIPScanner/fileObject/FileObjectState.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/fileObject/FileObjectNonExistentState.h" +#include "EIPScanner/fileObject/FileObjectEmptyState.h" +#include "EIPScanner/fileObject/FileObjectLoadedState.h" +#include "EIPScanner/fileObject/FileObjectUploadInProgressState.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectState.h b/src/EIPScanner/fileObject/FileObjectState.h similarity index 89% rename from src/fileObject/FileObjectState.h rename to src/EIPScanner/fileObject/FileObjectState.h index c7627057..de3f2589 100644 --- a/src/fileObject/FileObjectState.h +++ b/src/EIPScanner/fileObject/FileObjectState.h @@ -6,11 +6,11 @@ #define EIPSCANNER_FILEOBJECT_FILEOBJECTSTATE_H #include -#include "SessionInfo.h" -#include "MessageRouter.h" -#include "FileObject.h" -#include "cip/GeneralStatusCodes.h" -#include "utils/Logger.h" +#include "EIPScanner/SessionInfo.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/cip/GeneralStatusCodes.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectUploadInProgressState.cpp b/src/EIPScanner/fileObject/FileObjectUploadInProgressState.cpp similarity index 96% rename from src/fileObject/FileObjectUploadInProgressState.cpp rename to src/EIPScanner/fileObject/FileObjectUploadInProgressState.cpp index 0054a26b..78d0420a 100644 --- a/src/fileObject/FileObjectUploadInProgressState.cpp +++ b/src/EIPScanner/fileObject/FileObjectUploadInProgressState.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/23/19. // -#include "FileObjectUploadInProgressState.h" -#include "utils/Buffer.h" +#include "EIPScanner/fileObject/FileObjectUploadInProgressState.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace fileObject { diff --git a/src/fileObject/FileObjectUploadInProgressState.h b/src/EIPScanner/fileObject/FileObjectUploadInProgressState.h similarity index 91% rename from src/fileObject/FileObjectUploadInProgressState.h rename to src/EIPScanner/fileObject/FileObjectUploadInProgressState.h index 8a8b25f5..8556feb0 100644 --- a/src/fileObject/FileObjectUploadInProgressState.h +++ b/src/EIPScanner/fileObject/FileObjectUploadInProgressState.h @@ -7,8 +7,8 @@ #include -#include "FileObjectState.h" -#include "cip/Types.h" +#include "EIPScanner/fileObject/FileObjectState.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { namespace fileObject { diff --git a/src/sockets/BaseSocket.cpp b/src/EIPScanner/sockets/BaseSocket.cpp similarity index 98% rename from src/sockets/BaseSocket.cpp rename to src/EIPScanner/sockets/BaseSocket.cpp index efb71db2..a044acfd 100644 --- a/src/sockets/BaseSocket.cpp +++ b/src/EIPScanner/sockets/BaseSocket.cpp @@ -14,8 +14,8 @@ #include #include -#include "BaseSocket.h" -#include "Platform.h" +#include "EIPScanner/sockets/BaseSocket.h" +#include "EIPScanner/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/BaseSocket.h b/src/EIPScanner/sockets/BaseSocket.h similarity index 97% rename from src/sockets/BaseSocket.h rename to src/EIPScanner/sockets/BaseSocket.h index 1019fab1..429bb6dc 100644 --- a/src/sockets/BaseSocket.h +++ b/src/EIPScanner/sockets/BaseSocket.h @@ -13,7 +13,7 @@ #include #include -#include "EndPoint.h" +#include "EIPScanner/sockets/EndPoint.h" namespace eipScanner { namespace sockets { diff --git a/src/EIPScanner/sockets/CMakeLists.txt b/src/EIPScanner/sockets/CMakeLists.txt new file mode 100644 index 00000000..ba8b5f5b --- /dev/null +++ b/src/EIPScanner/sockets/CMakeLists.txt @@ -0,0 +1,11 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/BaseSocket.cpp + ${CMAKE_CURRENT_LIST_DIR}/EndPoint.cpp + ${CMAKE_CURRENT_LIST_DIR}/TCPSocket.cpp + ${CMAKE_CURRENT_LIST_DIR}/UDPBoundSocket.cpp + ${CMAKE_CURRENT_LIST_DIR}/UDPSocket.cpp + ${CMAKE_CURRENT_LIST_DIR}/Platform.cpp) + + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/sockets/EndPoint.cpp b/src/EIPScanner/sockets/EndPoint.cpp similarity index 93% rename from src/sockets/EndPoint.cpp rename to src/EIPScanner/sockets/EndPoint.cpp index b6de7ad8..3d72eaa7 100644 --- a/src/sockets/EndPoint.cpp +++ b/src/EIPScanner/sockets/EndPoint.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 12/10/19. // -#include "EndPoint.h" -#include "BaseSocket.h" -#include "Platform.h" +#include "EIPScanner/sockets/EndPoint.h" +#include "EIPScanner/sockets/BaseSocket.h" +#include "EIPScanner/sockets/Platform.h" #if defined(__unix__) || defined(__APPLE__) #include diff --git a/src/sockets/EndPoint.h b/src/EIPScanner/sockets/EndPoint.h similarity index 100% rename from src/sockets/EndPoint.h rename to src/EIPScanner/sockets/EndPoint.h diff --git a/src/sockets/Platform.cpp b/src/EIPScanner/sockets/Platform.cpp similarity index 91% rename from src/sockets/Platform.cpp rename to src/EIPScanner/sockets/Platform.cpp index 175343f0..1c19961c 100644 --- a/src/sockets/Platform.cpp +++ b/src/EIPScanner/sockets/Platform.cpp @@ -2,7 +2,7 @@ // Created by Stefan Broekman on 02/04/21. // -#include "Platform.h" +#include "EIPScanner/sockets/Platform.h" #if defined(_WIN32) || defined(WIN32) || defined(_WIN64) #include diff --git a/src/sockets/Platform.h b/src/EIPScanner/sockets/Platform.h similarity index 100% rename from src/sockets/Platform.h rename to src/EIPScanner/sockets/Platform.h diff --git a/src/sockets/TCPSocket.cpp b/src/EIPScanner/sockets/TCPSocket.cpp similarity index 97% rename from src/sockets/TCPSocket.cpp rename to src/EIPScanner/sockets/TCPSocket.cpp index bbceaac0..922579c3 100644 --- a/src/sockets/TCPSocket.cpp +++ b/src/EIPScanner/sockets/TCPSocket.cpp @@ -15,9 +15,9 @@ #include -#include "utils/Logger.h" -#include "TCPSocket.h" -#include "Platform.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/sockets/TCPSocket.h" +#include "EIPScanner/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/TCPSocket.h b/src/EIPScanner/sockets/TCPSocket.h similarity index 93% rename from src/sockets/TCPSocket.h rename to src/EIPScanner/sockets/TCPSocket.h index f5c28823..3c630854 100644 --- a/src/sockets/TCPSocket.h +++ b/src/EIPScanner/sockets/TCPSocket.h @@ -7,7 +7,7 @@ #include #include -#include "BaseSocket.h" +#include "EIPScanner/sockets/BaseSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPBoundSocket.cpp b/src/EIPScanner/sockets/UDPBoundSocket.cpp similarity index 90% rename from src/sockets/UDPBoundSocket.cpp rename to src/EIPScanner/sockets/UDPBoundSocket.cpp index 8b03fc91..83966c2b 100644 --- a/src/sockets/UDPBoundSocket.cpp +++ b/src/EIPScanner/sockets/UDPBoundSocket.cpp @@ -6,8 +6,8 @@ //#include //#include -#include "UDPBoundSocket.h" -#include "Platform.h" +#include "EIPScanner/sockets/UDPBoundSocket.h" +#include "EIPScanner/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPBoundSocket.h b/src/EIPScanner/sockets/UDPBoundSocket.h similarity index 93% rename from src/sockets/UDPBoundSocket.h rename to src/EIPScanner/sockets/UDPBoundSocket.h index 3d9c3f9f..82070828 100644 --- a/src/sockets/UDPBoundSocket.h +++ b/src/EIPScanner/sockets/UDPBoundSocket.h @@ -9,7 +9,7 @@ #include #include //#include -#include "UDPSocket.h" +#include "EIPScanner/sockets/UDPSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPSocket.cpp b/src/EIPScanner/sockets/UDPSocket.cpp similarity index 95% rename from src/sockets/UDPSocket.cpp rename to src/EIPScanner/sockets/UDPSocket.cpp index 04f1ddb2..f2758ca2 100644 --- a/src/sockets/UDPSocket.cpp +++ b/src/EIPScanner/sockets/UDPSocket.cpp @@ -12,9 +12,9 @@ #include #endif -#include "utils/Logger.h" -#include "UDPSocket.h" -#include "Platform.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/sockets/UDPSocket.h" +#include "EIPScanner/sockets/Platform.h" namespace eipScanner { namespace sockets { diff --git a/src/sockets/UDPSocket.h b/src/EIPScanner/sockets/UDPSocket.h similarity index 94% rename from src/sockets/UDPSocket.h rename to src/EIPScanner/sockets/UDPSocket.h index 285cc0a7..ed63f725 100644 --- a/src/sockets/UDPSocket.h +++ b/src/EIPScanner/sockets/UDPSocket.h @@ -8,7 +8,7 @@ #include #include #include -#include "BaseSocket.h" +#include "EIPScanner/sockets/BaseSocket.h" namespace eipScanner { namespace sockets { diff --git a/src/utils/Buffer.cpp b/src/EIPScanner/utils/Buffer.cpp similarity index 99% rename from src/utils/Buffer.cpp rename to src/EIPScanner/utils/Buffer.cpp index 0e3ed2a6..b77359c7 100644 --- a/src/utils/Buffer.cpp +++ b/src/EIPScanner/utils/Buffer.cpp @@ -2,7 +2,7 @@ // Created by flipback on 11/16/19. // -#include "Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace utils { diff --git a/src/utils/Buffer.h b/src/EIPScanner/utils/Buffer.h similarity index 96% rename from src/utils/Buffer.h rename to src/EIPScanner/utils/Buffer.h index 32c1409b..d3efb4d6 100644 --- a/src/utils/Buffer.h +++ b/src/EIPScanner/utils/Buffer.h @@ -8,9 +8,9 @@ #include #include #include -#include "cip/CipString.h" -#include "cip/CipRevision.h" -#include "sockets/EndPoint.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/cip/CipRevision.h" +#include "EIPScanner/sockets/EndPoint.h" namespace eipScanner { namespace utils { diff --git a/src/EIPScanner/utils/CMakeLists.txt b/src/EIPScanner/utils/CMakeLists.txt new file mode 100644 index 00000000..6bb00413 --- /dev/null +++ b/src/EIPScanner/utils/CMakeLists.txt @@ -0,0 +1,7 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/Logger.cpp + ${CMAKE_CURRENT_LIST_DIR}/Buffer.cpp) + + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/utils/Logger.cpp b/src/EIPScanner/utils/Logger.cpp similarity index 96% rename from src/utils/Logger.cpp rename to src/EIPScanner/utils/Logger.cpp index 495bc843..27cf44b2 100644 --- a/src/utils/Logger.cpp +++ b/src/EIPScanner/utils/Logger.cpp @@ -4,7 +4,7 @@ #include #include -#include "Logger.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { namespace utils { diff --git a/src/utils/Logger.h b/src/EIPScanner/utils/Logger.h similarity index 100% rename from src/utils/Logger.h rename to src/EIPScanner/utils/Logger.h diff --git a/src/EIPScanner/vendor/ra/CMakeLists.txt b/src/EIPScanner/vendor/ra/CMakeLists.txt new file mode 100644 index 00000000..f7b5a949 --- /dev/null +++ b/src/EIPScanner/vendor/ra/CMakeLists.txt @@ -0,0 +1,8 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultManager.cpp + ${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultObject.cpp + ${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultCode.cpp + ${CMAKE_CURRENT_LIST_DIR}/powerFlex525/DPIFaultParameter.cpp) + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/vendor/ra/powerFlex525/DPIFaultCode.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.cpp similarity index 94% rename from src/vendor/ra/powerFlex525/DPIFaultCode.cpp rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.cpp index bba3dbbf..e6f347e0 100644 --- a/src/vendor/ra/powerFlex525/DPIFaultCode.cpp +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.cpp @@ -2,7 +2,7 @@ // Created by James Roth on 12/18/19. // -#include "DPIFaultCode.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.h" namespace eipScanner { diff --git a/src/vendor/ra/powerFlex525/DPIFaultCode.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.h similarity index 100% rename from src/vendor/ra/powerFlex525/DPIFaultCode.h rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.h diff --git a/src/vendor/ra/powerFlex525/DPIFaultManager.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.cpp similarity index 96% rename from src/vendor/ra/powerFlex525/DPIFaultManager.cpp rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.cpp index 00f23348..5f2f8e4d 100644 --- a/src/vendor/ra/powerFlex525/DPIFaultManager.cpp +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.cpp @@ -2,9 +2,9 @@ // Created by Aleksey Timin on 12/11/19. // -#include "utils/Buffer.h" -#include "utils/Logger.h" -#include "DPIFaultManager.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h" namespace eipScanner { namespace vendor { diff --git a/src/vendor/ra/powerFlex525/DPIFaultManager.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h similarity index 94% rename from src/vendor/ra/powerFlex525/DPIFaultManager.h rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h index d56af022..917f1186 100644 --- a/src/vendor/ra/powerFlex525/DPIFaultManager.h +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h @@ -7,9 +7,9 @@ #include #include -#include "DPIFaultObject.h" -#include "SessionInfoIf.h" -#include "DPIFaultParameter.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h" +#include "EIPScanner/SessionInfoIf.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h" namespace eipScanner { namespace vendor { diff --git a/src/vendor/ra/powerFlex525/DPIFaultObject.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.cpp similarity index 95% rename from src/vendor/ra/powerFlex525/DPIFaultObject.cpp rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.cpp index e3f99cbe..3dbc6058 100644 --- a/src/vendor/ra/powerFlex525/DPIFaultObject.cpp +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.cpp @@ -3,8 +3,8 @@ // -#include "DPIFaultObject.h" -#include "utils/Buffer.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { diff --git a/src/vendor/ra/powerFlex525/DPIFaultObject.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h similarity index 92% rename from src/vendor/ra/powerFlex525/DPIFaultObject.h rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h index 5c116797..e93e03de 100644 --- a/src/vendor/ra/powerFlex525/DPIFaultObject.h +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h @@ -7,10 +7,10 @@ #include -#include "cip/CipString.h" -#include "BaseObject.h" -#include "SessionInfoIf.h" -#include "MessageRouter.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/BaseObject.h" +#include "EIPScanner/SessionInfoIf.h" +#include "EIPScanner/MessageRouter.h" namespace eipScanner { namespace vendor { diff --git a/src/vendor/ra/powerFlex525/DPIFaultParameter.cpp b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.cpp similarity index 98% rename from src/vendor/ra/powerFlex525/DPIFaultParameter.cpp rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.cpp index db43afbc..6c8c9db7 100644 --- a/src/vendor/ra/powerFlex525/DPIFaultParameter.cpp +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.cpp @@ -2,12 +2,12 @@ // Created by James Roth on 12/19/19. // -#include "DPIFaultParameter.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h" #include -#include "utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace vendor { diff --git a/src/vendor/ra/powerFlex525/DPIFaultParameter.h b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h similarity index 82% rename from src/vendor/ra/powerFlex525/DPIFaultParameter.h rename to src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h index 32c12881..f4554747 100644 --- a/src/vendor/ra/powerFlex525/DPIFaultParameter.h +++ b/src/EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h @@ -5,12 +5,12 @@ #ifndef EIPSCANNER_DPIFAULTPARAMETER_HPP #define EIPSCANNER_DPIFAULTPARAMETER_HPP -#include "cip/CipString.h" -#include "BaseObject.h" -#include "SessionInfoIf.h" -#include "MessageRouter.h" -#include "ParameterObject.h" -#include "DPIFaultCode.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/BaseObject.h" +#include "EIPScanner/SessionInfoIf.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/ParameterObject.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultCode.h" namespace eipScanner { namespace vendor { diff --git a/src/EIPScanner/vendor/yaskawa/CMakeLists.txt b/src/EIPScanner/vendor/yaskawa/CMakeLists.txt new file mode 100644 index 00000000..ecf55c4e --- /dev/null +++ b/src/EIPScanner/vendor/yaskawa/CMakeLists.txt @@ -0,0 +1,7 @@ +set(SOURCE_FILES + ${CMAKE_CURRENT_LIST_DIR}/mp3300iec/Yaskawa_EPath.cpp + ${CMAKE_CURRENT_LIST_DIR}/mp3300iec/Yaskawa_MessageRouter.cpp + ${CMAKE_CURRENT_LIST_DIR}/mp3300iec/Yaskawa_MessageRouterRequest.cpp) + +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) +target_sources(EIPScanner PUBLIC ${SOURCE_FILES}) \ No newline at end of file diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp similarity index 97% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp index db269463..ee546c7a 100644 --- a/src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp @@ -1,6 +1,6 @@ #include -#include "utils/Buffer.h" -#include "Yaskawa_EPath.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" namespace eipScanner { namespace cip { diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h similarity index 96% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h index 6fbf0356..a258b40e 100644 --- a/src/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h @@ -5,7 +5,7 @@ #include #include -#include "cip/Types.h" +#include "EIPScanner/cip/Types.h" namespace eipScanner { diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp similarity index 83% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp index f9669013..ba47cd18 100644 --- a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp @@ -1,14 +1,14 @@ #include -#include "eip/EncapsPacketFactory.h" -#include "utils/Buffer.h" -#include "Yaskawa_MessageRouter.h" -#include "Yaskawa_MessageRouterRequest.h" -#include "cip/MessageRouterResponse.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/CommonPacket.h" -#include "utils/Buffer.h" -#include "utils/Logger.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h" +#include "EIPScanner/cip/MessageRouterResponse.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/utils/Logger.h" namespace eipScanner { using namespace cip; diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h similarity index 91% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h index 40faa666..190661b5 100644 --- a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.h @@ -2,11 +2,11 @@ #define EIPSCANNER_YASKAWA_MESSAGEROUTER_H #include -#include "Yaskawa_EPath.h" -#include "cip/Services.h" -#include "cip/MessageRouterResponse.h" -#include "eip/CommonPacketItem.h" -#include "SessionInfo.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/cip/MessageRouterResponse.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/SessionInfo.h" namespace eipScanner { /** diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp similarity index 76% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp index 8ac06b18..3c355aaa 100644 --- a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp @@ -1,6 +1,6 @@ -#include -#include "Yaskawa_MessageRouterRequest.h" -#include "Yaskawa_EPath.h" +#include "EIPScanner/utils/Buffer.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" namespace eipScanner { namespace cip { diff --git a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h similarity index 85% rename from src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h rename to src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h index 2f2c6403..55c76ec2 100644 --- a/src/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h +++ b/src/EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.h @@ -4,8 +4,8 @@ #include #include -#include "cip/Services.h" -#include "Yaskawa_EPath.h" +#include "EIPScanner/cip/Services.h" +#include "EIPScanner/vendor/yaskawa/mp3300iec/Yaskawa_EPath.h" namespace eipScanner { namespace cip { diff --git a/src/vendor/CMakeLists.txt b/src/vendor/CMakeLists.txt deleted file mode 100644 index 99ac1d1f..00000000 --- a/src/vendor/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -include_directories(ra/powerFlex525) -include_directories(yaskawa/mp3300iec) - -set( VENDOR_FILES - # ra - vendor/ra/powerFlex525/DPIFaultManager.cpp - vendor/ra/powerFlex525/DPIFaultObject.cpp - vendor/ra/powerFlex525/DPIFaultCode.cpp - vendor/ra/powerFlex525/DPIFaultParameter.cpp - - # yaskawa - vendor/yaskawa/mp3300iec/Yaskawa_EPath.cpp - vendor/yaskawa/mp3300iec/Yaskawa_MessageRouter.cpp - vendor/yaskawa/mp3300iec/Yaskawa_MessageRouterRequest.cpp - - PARENT_SCOPE -) \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 1ac842f8..a827e5e1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.5) + enable_testing() include_directories("${PROJECT_SOURCE_DIR}/src") include_directories("${PROJECT_SOURCE_DIR}/test") diff --git a/test/Mocks.h b/test/Mocks.h index bec4d4af..b50dc8c6 100644 --- a/test/Mocks.h +++ b/test/Mocks.h @@ -6,7 +6,7 @@ #define EIPSCANNER_MOCKS_H #include -#include "MessageRouter.h" +#include "EIPScanner/MessageRouter.h" class TMockMessageRouter : public eipScanner::MessageRouter { public: diff --git a/test/README.md b/test/README.md new file mode 100644 index 00000000..7e5ec498 --- /dev/null +++ b/test/README.md @@ -0,0 +1,11 @@ +# Tests + +These tests use the source code of this repo. + +Therefore the paths are `"EIPScanner/..."` rather than `` +* The source files are being linked directly rather than through the EIPScanner `/usr/local/lib` shared object file + + +## Requirements + +The GMock Library: `sudo apt install libgmock-dev` \ No newline at end of file diff --git a/test/TestDiscoveryManager.cpp b/test/TestDiscoveryManager.cpp index 0a027855..0677e24e 100644 --- a/test/TestDiscoveryManager.cpp +++ b/test/TestDiscoveryManager.cpp @@ -6,7 +6,7 @@ #include #include "Mocks.h" -#include "DiscoveryManager.h" +#include "EIPScanner/DiscoveryManager.h" using namespace eipScanner; diff --git a/test/TestIdentityObject.cpp b/test/TestIdentityObject.cpp index c5bba93b..99bc8c43 100644 --- a/test/TestIdentityObject.cpp +++ b/test/TestIdentityObject.cpp @@ -4,7 +4,7 @@ #include #include "Mocks.h" -#include "IdentityObject.h" +#include "EIPScanner/IdentityObject.h" using namespace eipScanner; diff --git a/test/TestMessageRouter.cpp b/test/TestMessageRouter.cpp index c9306c30..9e19c563 100644 --- a/test/TestMessageRouter.cpp +++ b/test/TestMessageRouter.cpp @@ -4,13 +4,13 @@ #include #include "Mocks.h" -#include "MessageRouter.h" -#include "eip/CommonPacket.h" -#include "eip/CommonPacketItem.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/EncapsPacketFactory.h" -#include "cip/MessageRouterRequest.h" -#include "cip/MessageRouterResponse.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/eip/CommonPacket.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/cip/MessageRouterRequest.h" +#include "EIPScanner/cip/MessageRouterResponse.h" using namespace eipScanner; diff --git a/test/TestParameterObject.cpp b/test/TestParameterObject.cpp index 0f16b4b4..efd110bc 100644 --- a/test/TestParameterObject.cpp +++ b/test/TestParameterObject.cpp @@ -4,7 +4,7 @@ #include #include "Mocks.h" -#include "ParameterObject.h" +#include "EIPScanner/ParameterObject.h" using namespace eipScanner; using ::testing::Return; diff --git a/test/cip/TestCipRevision.cpp b/test/cip/TestCipRevision.cpp index ae8f6009..92731c4f 100644 --- a/test/cip/TestCipRevision.cpp +++ b/test/cip/TestCipRevision.cpp @@ -3,7 +3,7 @@ // #include -#include "cip/CipRevision.h" +#include "EIPScanner/cip/CipRevision.h" using eipScanner::cip::CipRevision; diff --git a/test/cip/TestCipString.cpp b/test/cip/TestCipString.cpp index f23240b6..dac17446 100644 --- a/test/cip/TestCipString.cpp +++ b/test/cip/TestCipString.cpp @@ -4,8 +4,8 @@ // #include -#include "cip/CipString.h" -#include "utils/Buffer.h" +#include "EIPScanner/cip/CipString.h" +#include "EIPScanner/utils/Buffer.h" using eipScanner::cip::CipBaseString; using eipScanner::utils::Buffer; diff --git a/test/cip/TestEPath.cpp b/test/cip/TestEPath.cpp index e4993721..86a2d3d7 100644 --- a/test/cip/TestEPath.cpp +++ b/test/cip/TestEPath.cpp @@ -3,7 +3,7 @@ // #include -#include "cip/EPath.h" +#include "EIPScanner/cip/EPath.h" using eipScanner::cip::EPath; diff --git a/test/cip/TestMessageRouterResponse.cpp b/test/cip/TestMessageRouterResponse.cpp index 828f30a7..80d86a16 100644 --- a/test/cip/TestMessageRouterResponse.cpp +++ b/test/cip/TestMessageRouterResponse.cpp @@ -3,7 +3,7 @@ // #include -#include "cip/MessageRouterResponse.h" +#include "EIPScanner/cip/MessageRouterResponse.h" using eipScanner::cip::MessageRouterResponse; diff --git a/test/eip/TestCommonPacket.cpp b/test/eip/TestCommonPacket.cpp index 7f90e50c..e41e27bf 100644 --- a/test/eip/TestCommonPacket.cpp +++ b/test/eip/TestCommonPacket.cpp @@ -3,9 +3,9 @@ // #include -#include "eip/CommonPacketItem.h" -#include "eip/CommonPacketItemFactory.h" -#include "eip/CommonPacket.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacket.h" using eipScanner::eip::CommonPacket; using eipScanner::eip::CommonPacketItem; diff --git a/test/eip/TestCommonPacketItem.cpp b/test/eip/TestCommonPacketItem.cpp index b43fc1e9..5e7e78e1 100644 --- a/test/eip/TestCommonPacketItem.cpp +++ b/test/eip/TestCommonPacketItem.cpp @@ -3,8 +3,8 @@ // #include -#include "eip/CommonPacketItem.h" -#include "eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacketItem.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" using eipScanner::eip::CommonPacketItem; using eipScanner::eip::CommonPacketItemFactory; diff --git a/test/eip/TestCommonPacketItemFactory.cpp b/test/eip/TestCommonPacketItemFactory.cpp index 56e657f2..690c7c43 100644 --- a/test/eip/TestCommonPacketItemFactory.cpp +++ b/test/eip/TestCommonPacketItemFactory.cpp @@ -3,7 +3,7 @@ // #include -#include "eip/CommonPacketItemFactory.h" +#include "EIPScanner/eip/CommonPacketItemFactory.h" using eipScanner::eip::CommonPacketItemFactory; using eipScanner::eip::CommonPacketItemIds; diff --git a/test/eip/TestEncapsPacket.cpp b/test/eip/TestEncapsPacket.cpp index 922e292e..6e8a3a75 100644 --- a/test/eip/TestEncapsPacket.cpp +++ b/test/eip/TestEncapsPacket.cpp @@ -3,7 +3,7 @@ // #include -#include "eip/EncapsPacket.h" +#include "EIPScanner/eip/EncapsPacket.h" using eipScanner::eip::EncapsPacket; using eipScanner::eip::EncapsCommands; diff --git a/test/eip/TestEncapsPacketFactory.cpp b/test/eip/TestEncapsPacketFactory.cpp index ea26b031..de55246b 100644 --- a/test/eip/TestEncapsPacketFactory.cpp +++ b/test/eip/TestEncapsPacketFactory.cpp @@ -2,8 +2,8 @@ // Created by Aleksey Timin on 11/16/19. // #include -#include "eip/EncapsPacketFactory.h" -#include "eip/EncapsPacket.h" +#include "EIPScanner/eip/EncapsPacketFactory.h" +#include "EIPScanner/eip/EncapsPacket.h" using eipScanner::eip::EncapsPacket; using eipScanner::eip::EncapsPacketFactory; diff --git a/test/fileObject/Mocks.h b/test/fileObject/FileObjectMocks.h similarity index 86% rename from test/fileObject/Mocks.h rename to test/fileObject/FileObjectMocks.h index c775a755..62e6da3a 100644 --- a/test/fileObject/Mocks.h +++ b/test/fileObject/FileObjectMocks.h @@ -6,10 +6,10 @@ #define EIPSCANNER_TEST_FILEOBJECT_MOCKS_H #include "../Mocks.h" -#include "MessageRouter.h" -#include "FileObject.h" -#include "fileObject/FileObjectState.h" -#include "utils/Buffer.h" +#include "EIPScanner/MessageRouter.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/fileObject/FileObjectState.h" +#include "EIPScanner/utils/Buffer.h" namespace eipScanner { namespace fileObject { diff --git a/test/fileObject/TestFileObjectLoadedState.cpp b/test/fileObject/TestFileObjectLoadedState.cpp index 2e0a4094..dc2ad9c9 100644 --- a/test/fileObject/TestFileObjectLoadedState.cpp +++ b/test/fileObject/TestFileObjectLoadedState.cpp @@ -4,10 +4,10 @@ #include #include -#include "./Mocks.h" -#include "FileObject.h" -#include "fileObject/FileObjectLoadedState.h" -#include "utils/Buffer.h" +#include "FileObjectMocks.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/fileObject/FileObjectLoadedState.h" +#include "EIPScanner/utils/Buffer.h" using namespace eipScanner; using eipScanner::fileObject::FileObjectLoadedState; diff --git a/test/fileObject/TestFileObjectUploadInProgressState.cpp b/test/fileObject/TestFileObjectUploadInProgressState.cpp index 8da1df3c..e09e5560 100644 --- a/test/fileObject/TestFileObjectUploadInProgressState.cpp +++ b/test/fileObject/TestFileObjectUploadInProgressState.cpp @@ -4,10 +4,10 @@ #include #include -#include "Mocks.h" -#include "FileObject.h" -#include "fileObject/FileObjectUploadInProgressState.h" -#include "utils/Buffer.h" +#include "FileObjectMocks.h" +#include "EIPScanner/FileObject.h" +#include "EIPScanner/fileObject/FileObjectUploadInProgressState.h" +#include "EIPScanner/utils/Buffer.h" using namespace eipScanner; using eipScanner::fileObject::FileObjectUploadInProgressState; diff --git a/test/sockets/TestEndPoint.cpp b/test/sockets/TestEndPoint.cpp index 2a7e96c2..d080d682 100644 --- a/test/sockets/TestEndPoint.cpp +++ b/test/sockets/TestEndPoint.cpp @@ -3,7 +3,7 @@ // #include -#include "sockets/EndPoint.h" +#include "EIPScanner/sockets/EndPoint.h" using eipScanner::sockets::EndPoint; diff --git a/test/test.cpp b/test/test.cpp index 00b3b138..59b68a48 100644 --- a/test/test.cpp +++ b/test/test.cpp @@ -3,7 +3,7 @@ // #include -#include "utils/Logger.h" +#include "EIPScanner/utils/Logger.h" int main(int argc, char **argv) { eipScanner::utils::Logger::setLogLevel(eipScanner::utils::LogLevel::DEBUG); diff --git a/test/utils/TestBuffer.cpp b/test/utils/TestBuffer.cpp index 2adb401c..13a730bd 100644 --- a/test/utils/TestBuffer.cpp +++ b/test/utils/TestBuffer.cpp @@ -1,6 +1,6 @@ #include -#include "utils/Buffer.h" +#include "EIPScanner/utils/Buffer.h" using namespace eipScanner; using eipScanner::utils::Buffer; diff --git a/test/vendor/ra/powerFlex525/TestDPIFaultManager.cpp b/test/vendor/ra/powerFlex525/TestDPIFaultManager.cpp index e940468f..69a7e639 100644 --- a/test/vendor/ra/powerFlex525/TestDPIFaultManager.cpp +++ b/test/vendor/ra/powerFlex525/TestDPIFaultManager.cpp @@ -4,7 +4,7 @@ #include #include "Mocks.h" -#include "vendor/ra/powerFlex525/DPIFaultManager.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultManager.h" using namespace eipScanner; using namespace eipScanner::vendor::ra::powerFlex525; diff --git a/test/vendor/ra/powerFlex525/TestDPIFaultObject.cpp b/test/vendor/ra/powerFlex525/TestDPIFaultObject.cpp index 77a12c22..8e8b4090 100644 --- a/test/vendor/ra/powerFlex525/TestDPIFaultObject.cpp +++ b/test/vendor/ra/powerFlex525/TestDPIFaultObject.cpp @@ -5,7 +5,7 @@ #include #include "Mocks.h" -#include "vendor/ra/powerFlex525/DPIFaultObject.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h" using namespace eipScanner; using namespace eipScanner::vendor::ra::powerFlex525; diff --git a/test/vendor/ra/powerFlex525/TestDPIFaultParameter.cpp b/test/vendor/ra/powerFlex525/TestDPIFaultParameter.cpp index 7f275c16..c7945d21 100644 --- a/test/vendor/ra/powerFlex525/TestDPIFaultParameter.cpp +++ b/test/vendor/ra/powerFlex525/TestDPIFaultParameter.cpp @@ -5,8 +5,8 @@ #include #include "Mocks.h" -#include "vendor/ra/powerFlex525/DPIFaultObject.h" -#include "vendor/ra/powerFlex525/DPIFaultParameter.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultObject.h" +#include "EIPScanner/vendor/ra/powerFlex525/DPIFaultParameter.h" using namespace eipScanner; using namespace eipScanner::vendor::ra::powerFlex525;