Improve compilation flags - \#11

Signed-off-by: Mateusz Mazur <mateusz.mazur@e.email>

Author: Mazurel

CMakeLists.txt

@@ -3,9 +3,7 @@ project(protocolConverter)
 
 set(CMAKE_CXX_STANDARD 17)
 
-if (DCMAKE_BUILD_TYPE MATCHES Debug)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -lpthread -Wall")
-endif()
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -pedantic")
 
 option(MODBUS_EXAMPLE "Build example program" OFF)
 option(MODBUS_TESTS "Build tests" OFF)
@@ -21,4 +19,3 @@ if(MODBUS_EXAMPLE)
     add_executable(ex example/main.cpp)
     target_link_libraries(ex Modbus)
 endif()
-

README.md

@@ -2,8 +2,9 @@
 
 Library for high level Modbus frame manipulation, including encoding and decoding, written in modern C++17.
 
-Additionally, library contains simple linux TCP and RTU implementation,
+Additionally, library contains reference TCP and RTU implementation (on Linux only !),
 that you can use as a starting point for you application !
+Until there will some reliable way to test it, it will be treated as such.
 
 # Table of content
 - [Why](#why)

src/Serial/connection.cpp

@@ -3,6 +3,7 @@
 // Licensed under: MIT License <http://opensource.org/licenses/MIT>
 
 #include "Serial/connection.hpp"
+#include <sys/poll.h>
 
 using namespace MB::Serial;
 
@@ -52,7 +53,10 @@ std::vector<uint8_t> Connection::sendException(const MB::ModbusException &except
 std::vector<uint8_t> Connection::awaitRawMessage() {
     std::vector<uint8_t> data(1024);
 
-    pollfd waitingFD = {.fd = _fd, .events = POLLIN, .revents = POLLIN};
+    pollfd waitingFD;
+    waitingFD.fd = this->_fd;
+    waitingFD.events = POLLIN;
+    waitingFD.revents = POLLIN;
 
     if (::poll(&waitingFD, 1, _timeout) <= 0) {
         throw MB::ModbusException(MB::utils::Timeout);

src/TCP/connection.cpp

@@ -3,6 +3,8 @@
 // Licensed under: MIT License <http://opensource.org/licenses/MIT>
 
 #include "TCP/connection.hpp"
+#include <sys/poll.h>
+#include <sys/socket.h>
 
 using namespace MB::TCP;
 
@@ -86,8 +88,11 @@ std::vector<uint8_t> Connection::sendException(const MB::ModbusException &ex) {
 }
 
 std::vector<uint8_t> Connection::awaitRawMessage() {
-    pollfd _pfd = {.fd = _sockfd, .events = POLLIN, .revents = POLLIN};
-    if (::poll(&_pfd, 1, 60 * 1000 /* 1 minute means the connection has died */) <= 0) {
+    pollfd pfd;
+    pfd.fd = this->_sockfd;
+    pfd.events = POLLIN;
+    pfd.revents = POLLIN;
+    if (::poll(&pfd, 1, 60 * 1000 /* 1 minute means the connection has died */) <= 0) {
         throw MB::ModbusException(MB::utils::ConnectionClosed);
     }
 
@@ -108,8 +113,11 @@ std::vector<uint8_t> Connection::awaitRawMessage() {
 }
 
 MB::ModbusRequest Connection::awaitRequest() {
-    pollfd _pfd = {.fd = _sockfd, .events = POLLIN, .revents = POLLIN};
-    if (::poll(&_pfd, 1, 60 * 1000 /* 1 minute means the connection has died */) <= 0) {
+    pollfd pfd;
+    pfd.fd = this->_sockfd;
+    pfd.events = POLLIN;
+    pfd.revents = POLLIN;
+    if (::poll(&pfd, 1, 60 * 1000 /* 1 minute means the connection has died */) <= 0) {
         throw MB::ModbusException(MB::utils::Timeout);
     }
 
@@ -136,13 +144,17 @@ MB::ModbusRequest Connection::awaitRequest() {
 }
 
 MB::ModbusResponse Connection::awaitResponse() {
-    pollfd _pfd = {.fd = _sockfd, .events = POLLIN, .revents = POLLIN};
-    if (::poll(&_pfd, 1, _timeout) <= 0) {
+    pollfd pfd;
+    pfd.fd = this->_sockfd;
+    pfd.events = POLLIN;
+    pfd.revents = POLLIN;
+
+    if (::poll(&pfd, 1, this->_timeout) <= 0) {
         throw MB::ModbusException(MB::utils::Timeout);
     }
 
     std::vector<uint8_t> r(1024);
-    auto size = ::recv(_sockfd, r.begin().base(), r.size(), 0);
+    auto size = ::recv(this->_sockfd, r.begin().base(), r.size(), 0);
 
     if (size == -1)
         throw MB::ModbusException(MB::utils::ProtocolError);
@@ -155,7 +167,7 @@ MB::ModbusResponse Connection::awaitResponse() {
 
     const auto resultMessageID = *reinterpret_cast<uint16_t *>(&r[0]);
 
-    if (resultMessageID != _messageID)
+    if (resultMessageID != this->_messageID)
         throw MB::ModbusException(MB::utils::InvalidMessageID);
 
     r.erase(r.begin(), r.begin() + 6);
@@ -180,10 +192,10 @@ Connection Connection::with(std::string addr, int port) {
     if (sock == -1)
         throw std::runtime_error("Cannot open socket, errno = " + std::to_string(errno));
 
-    sockaddr_in server = {.sin_family = AF_INET,
-                          .sin_port   = htons(port),
-                          .sin_addr   = {inet_addr(addr.c_str())},
-                          .sin_zero   = {}};
+    sockaddr_in server;
+    server.sin_family = AF_INET;
+    server.sin_port = ::htons(port);
+    server.sin_addr = { inet_addr(addr.c_str()) };
 
     if (::connect(sock, reinterpret_cast<struct sockaddr *>(&server), sizeof(server)) < 0)
         throw std::runtime_error("Cannot connect, errno = " + std::to_string(errno));