Fix install of header files

Also now build FETPAPI with Wintls on windows CI and check that all header files are correctly installed

Author: philippeVerney

.github/workflows/github-actions.yml

@@ -65,6 +65,9 @@ jobs:
         run: |
           curl -L "https://archives.boost.io/release/1.90.0/binaries/boost_1_90_0-msvc-14.2-64.exe" -o "${{ runner.temp }}\boost.exe"
           Start-Process -Wait -FilePath "${{ runner.temp }}\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=${{ runner.temp }}\boost-install"
+      - name : Wintls install
+        run: |
+          git clone -b v1.0.0 https://github.com/laudrup/boost-wintls.git ${{ runner.temp }}\wintls
       - name: AVRO install
         run: |
           cd ${{ runner.temp }}
@@ -83,8 +86,20 @@ jobs:
           cd ${{ github.workspace }}/..
           mkdir build
           cd build
-          cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi2_14_1_0-cpp-vs2019-x64 -DWITH_ETP_SSL=FALSE ${{ github.workspace }}
+          cmake -G"Visual Studio 17 2022" -A x64 -T host=x64 -Wno-dev -Wno-deprecated -DBoost_INCLUDE_DIR=${{ runner.temp }}\boost-install -DAVRO_ROOT=${{ runner.temp }}/avro-cpp-install -DAVRO_USE_STATIC_LIBS=TRUE -DWITH_FESAPI=TRUE -DFESAPI_ROOT=${{ runner.temp }}/fesapi2_14_1_0-cpp-vs2019-x64 -DWINTLS_ROOT=${{ runner.temp }}\wintls ${{ github.workspace }}
           cmake --build . --config Release -j2
+          cmake --install .
+      - name: Compare install header files vs source header files
+        shell: bash
+        run: |
+          dir1="${{ github.workspace }}/src"
+          dir2="${{ github.workspace }}/../build/install/include"
+          diff <(cd "$dir1" && find . -type f -name "*.h" | sort) <(cd "$dir2" && find . -type f -name "*.h" | sort)
+          if [ $? -ne 0 ]; then
+           echo "❌ The directories have not the same .h files"
+           exit 1
+          fi
+          echo "✅ The directories have the same .h files"
   ubuntu-22:
     runs-on: ubuntu-22.04
     steps:

CMakeLists.txt

@@ -290,13 +290,13 @@ install(EXPORT Fetpapi-export
 )
 
 INSTALL (
-	FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/macroDefinitions.h
+	FILES ${FETPAPI_HEADERS}
 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fetpapi
 	COMPONENT fetpapi_headers
 )
 
 INSTALL (
-	FILES ${FETPAPI_HEADERS}
+	FILES ${FETPAPI_ETP_HEADERS}
 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fetpapi/etp
 	COMPONENT fetpapi_headers
 )

README.md

@@ -13,7 +13,7 @@ Download (build and install if necessary) third party libraries:
 - BOOST : All versions from version 1.66 should be ok but you may experience some [min/max build issues](https://github.com/boostorg/beast/issues/1980) using version 1.72 or 1.73.
 - AVRO : https://avro.apache.org/releases.html#Download (starting from version 1.9.0 [except 1.11.1](https://issues.apache.org/jira/browse/AVRO-3601), build it with the above boost library.)
 - (OPTIONALLY) OpenSSL : version 3.4 is known to work. OpenSSL is mandatory on Unix environement if you want SSL/TLS support. On Windows environment, you can depends on [Wintls](https://github.com/laudrup/boost-wintls/tree/master) instead
-- (OPTIONALLY) [Wintls](https://github.com/laudrup/boost-wintls/tree/master) : Starting from version 0.9.9. Only on Windows and only if you don't want to use OpenSSL to support SSL/TLS. FYI, WinTLs uses native Windows API [(SSPI/Schannel)](https://docs.microsoft.com/en-us/windows-server/security/tls/tls-ssl-schannel-ssp-overview) functionality instead of OpenSSL for providing TLS encrypted stream functionality.
+- (OPTIONALLY) [Wintls](https://github.com/laudrup/boost-wintls/tree/master) : Starting from version 0.9.9. Only on Windows and only if you don't want to use OpenSSL to support SSL/TLS. FYI, Wintls uses native Windows API [(SSPI/Schannel)](https://docs.microsoft.com/en-us/windows-server/security/tls/tls-ssl-schannel-ssp-overview) functionality instead of OpenSSL for providing TLS encrypted stream functionality.
 - (OPTIONALLY) [FESAPI](https://github.com/F2I-Consulting/fesapi/releases) : All versions from version 2.7.0.0 should be ok but a minimal version of 2.11.0.0 is recommended to automatically recognize FESAPI CMake Variables using CMake find Module and build silently the EtpClient example.
 
 # Configure the build

src/etp/AbstractSession.cpp

@@ -140,7 +140,6 @@ void AbstractSession::on_read(boost::system::error_code ec, std::size_t bytes_tr
 				}
 			} // Scope for specificProtocolHandlersLock
 
-			size_t receivedMhProtocol = static_cast<size_t>(receivedMh.protocol);
 			if (specificProtocolHandler) {
 				// Receive a message which has been asked to be processed with a specific protocol handler
 				specificProtocolHandler->decodeMessageBody(receivedMh, d);
@@ -157,14 +156,13 @@ void AbstractSession::on_read(boost::system::error_code ec, std::size_t bytes_tr
 				}
 			}
 			else {
-				auto normalProtocolHandlerIt = protocolHandlers.find(receivedMhProtocol);
-				if (normalProtocolHandlerIt != protocolHandlers.end()) {
+				if (auto normalProtocolHandlerIt = protocolHandlers.find(receivedMh.protocol);  normalProtocolHandlerIt != protocolHandlers.end()) {
 					// Receive a message to be processed with a common protocol handler in case for example an unsollicited notification
 					normalProtocolHandlerIt->second->decodeMessageBody(receivedMh, d);
 				}
 				else {
-					std::cerr << "Received a message with id " << receivedMh.messageId << " for which no protocol handler is associated. Protocol " << receivedMhProtocol << std::endl;
-					send(ETP_NS::EtpHelpers::buildSingleMessageProtocolException(4, "The agent does not support the protocol " + std::to_string(receivedMhProtocol) + " identified in a message header."), receivedMh.messageId, 0x02);
+					std::cerr << "Received a message with id " << receivedMh.messageId << " for which no protocol handler is associated. Protocol " << receivedMh.protocol << std::endl;
+					send(ETP_NS::EtpHelpers::buildSingleMessageProtocolException(4, "The agent does not support the protocol " + std::to_string(receivedMh.protocol) + " identified in a message header."), receivedMh.messageId, 0x02);
 				}
 			}
 		}