Merge pull request #2 from jimklimov/bump-libmodbus-3.1.11

Bump `rtu_usb` branch to libmodbus v3.1.11

Author: jimklimov

.clabot

@@ -1,33 +1,48 @@
 {
     "contributors": [
-        "rm5248",
         "0x34d",
+        "20162026",
+        "2128506",
         "alongl",
         "arkapkaj",
         "bobbybelieve",
         "ccdmuro",
         "cedricboudinet",
         "DavidKorczynski",
         "devotip",
+        "diplfranzhoepfinger",
         "embeddedmz",
         "fcntlcc",
+        "fedepell",
+        "franzhoepfinger",
+        "franzhollerer",
+        "ghorwin",
         "jbysewski",
         "jcarrano",
+        "jeroendoggen",
         "jetforme",
         "jiriki86",
         "jordanjohnson56",
+        "kay30kim",
+        "kyllingstad",
+        "mek-x",
         "merkag",
         "mhei",
+        "msk-repo-0x4d",
         "ndunks",
         "peternewman",
+        "philj56",
+        "raymondbh",
         "ringlej",
+        "rm5248",
+        "rongli-eaton",
         "sebastianpsm",
+        "SergeyMy",
         "sirsoweird",
         "taikiakita",
-        "vvck",
-        "woodsnake",
         "vancepym",
-        "mek-x"
+        "vvck",
+        "woodsnake"
     ],
     "message": "We require contributors to sign our Contributor License Agreement. In order for us to review and merge your code, please fill https://forms.gle/5635zjphDo5JEJQSA to get added. Your document will be manually checked by the maintainer. Be patient..."
 }

.github/FUNDING.yml

@@ -1 +1,2 @@
 github: [stephane]
+polar: stephane

NEWS

@@ -1,5 +1,35 @@
 # NEWS
 
+## libmodbus 3.1.11 (2024-10-22)
+
+- RTU - Check CRC before filtering on slave ID
+- HAVE_NETINET_IN_H as guard around header (closes #765)
+- Use default port 502 in documentation.
+- Fix float endianness issue introduced in v3.1.8 (49af73d).
+  Thank you @ghorwin for your excellent work on the subject.
+  Closes #665, #694, #757, #770.
+- Proper display of used CFLAGS.
+- Don't build with debug flag by default anymore.
+- Check request length in `modbus_reply` when used in `memcpy`.
+  Thank you Nozomi Networks Labs Advisory for the report.
+- Fix insecure data handling. CID 416366: INTEGER_OVERFLOW found with Coverity
+  Scan.
+- Remove useless cast in setsockopt call (closes #721)
+- Link against socket and nsl libs when building on SunOS. Thank you @lanurmi.
+- Update documentation about tcp-pi requiring 1 KiB of extra memory (closes #715).
+  Thank you @psychon.
+- Documentation improvements by @cedricboudinet and @mhei.
+- Revert TCP checks for recovery (closes #711).
+- Don't use loop initial declaration (closes #752).
+- Fix wrong generated version for double number in win32 (closes #675).
+- Don't use gai_strerror if not available.
+- Add checks for netinet/ip.h and gai_strerror (#745)
+- Log error in read input registers if debug (closes #755).
+- Fix errno value on timeout with TCP connect (closes #736, #756).
+  Thank you @kyllingstad for the issue and @psychon for the fix.
+- Free addrinfo struct on getaddrinfo() gerrors.
+- Fix doc of modbus_mapping_new_start_address (#615).
+
 ## libmodbus 3.1.10 (2022-12-07)
 
 Urgent release to fix a regression.
@@ -388,7 +418,7 @@ RTS flow control.
 - Enable RS485 support only when available
 - Export modbus_set/get_serial_mode functions on all platforms
 - API change for read/write multiple registers function:
-  - modbus_read_and_write_registers -> modbus_write_and_read_registers
+    - modbus_read_and_write_registers -> modbus_write_and_read_registers
         The function name was confusing because the write operation is performed
         before the read. Take care to swap the arguments in the migration process.
 - Documentation of modbus*write_and_read_registers, modbus_mapping_new/free,
@@ -411,13 +441,13 @@ RTS flow control.
     modbus_receive_confirmation)
 - Fix flush function of TCP backend on Windows
 - API changes for server/slave:
-  - modbus_receive doesn't take socket/fd argument anymore
-  - new function modbus_set_socket to set socket/fd
+    - modbus_receive doesn't take socket/fd argument anymore
+    - new function modbus_set_socket to set socket/fd
 - API changes for timeout functions:
-  - modbus_get_timeout_begin -> modbus_get_response_timeout
-  - modbus_set_timeout_begin -> modbus_set_response_timeout
-  - modbus_get_timeout_end -> modbus_get_byte_timeout
-  - modbus_set_timeout_end -> modbus_set_byte_timeout
+    - modbus_get_timeout_begin -> modbus_get_response_timeout
+    - modbus_set_timeout_begin -> modbus_set_response_timeout
+    - modbus_get_timeout_end -> modbus_get_byte_timeout
+    - modbus_set_timeout_end -> modbus_set_byte_timeout
 - Fix longstanding limitation of server to wait forever
 - New functions modbus_set/get_serial_mode by Manfred Gruber and Stéphane
     Raimbault for RS485 communications
@@ -434,9 +464,9 @@ RTS flow control.
     modbus_reply_exception()
 - New function modbus_get_header_length(modbus_t \*ctx)
 - New functions to manipulate data:
-  - MODBUS_GET_INT32_FROM_INT16
-  - MODBUS_GET_INT16_FROM_INT8
-  - MODBUS_SET_INT16_TO_INT8
+    - MODBUS_GET_INT32_FROM_INT16
+    - MODBUS_GET_INT16_FROM_INT8
+    - MODBUS_SET_INT16_TO_INT8
 - Fix GH-2. Read/write were swapped in \_FC_READ_AND_WRITE_REGISTERS
 - Install an ignore handler for SIGPIPE on \*BSD
     Original patch by Jason Oster.
@@ -506,8 +536,7 @@ RTS flow control.
 
 Other changes:
 
-- The code is now published and developed on
-    <http://github.com/stephane/libmodbus>
+- The code is now published and developed on <http://github.com/stephane/libmodbus>
 - Waf support has been removed
 
 ## libmodbus 2.0.3 (2009-03-22)

README.md

@@ -1,6 +1,7 @@
 # A groovy modbus library
 
 ![Build Status](https://github.com/stephane/libmodbus/actions/workflows/build.yml/badge.svg)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/8058/badge.svg)](https://scan.coverity.com/projects/libmodbus)
 
 ## Overview
 

configure.ac

@@ -13,7 +13,7 @@
 #
 m4_define([libmodbus_version_major], [3])
 m4_define([libmodbus_version_minor], [1])
-m4_define([libmodbus_version_micro], [10])
+m4_define([libmodbus_version_micro], [11])
 
 m4_define([libmodbus_release_status],
     [m4_if(m4_eval(libmodbus_version_minor % 2), [1], [snapshot], [release])])
@@ -29,7 +29,7 @@ AC_INIT([libmodbus],
         [http://libmodbus.org/])
 AC_CONFIG_SRCDIR([src/modbus.c])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([check-news foreign 1.11 -Wall -Wno-portability silent-rules tar-pax subdir-objects])
+AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax subdir-objects])
 AC_PROG_CC
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
@@ -59,6 +59,7 @@ AC_CANONICAL_HOST
 os_win32="false"
 os_cygwin="false"
 os_qnx="false"
+os_sunos="false"
 case "${host_os}" in
       *mingw32*)
     os_win32="true"
@@ -68,6 +69,9 @@ case "${host_os}" in
   ;;
       *cygwin*)
     os_cygwin="true"
+  ;;
+      *solaris*)
+    os_sunos="true"
   ;;
 esac
 AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "true")
@@ -85,6 +89,7 @@ AC_CHECK_HEADERS([ \
     linux/serial.h \
     netdb.h \
     netinet/in.h \
+    netinet/ip.h \
     netinet/tcp.h \
     sys/ioctl.h \
     sys/params.h \
@@ -104,7 +109,7 @@ AC_CHECK_DECLS([__CYGWIN__])
 AC_SEARCH_LIBS(accept, network socket)
 
 # Checks for library functions.
-AC_CHECK_FUNCS([accept4 getaddrinfo gettimeofday inet_pton inet_ntop select socket strerror strlcpy])
+AC_CHECK_FUNCS([accept4 gai_strerror getaddrinfo gettimeofday inet_pton inet_ntop select socket strerror strlcpy])
 
 # Required for MinGW with GCC v4.8.1 on Win7
 AC_DEFINE(WINVER, 0x0501, _)
@@ -132,19 +137,23 @@ if test "$os_cygwin" = "false"; then
     fi
 fi
 
+if test "$os_sunos" = "true"; then
+    LIBS="$LIBS -lnsl -lsocket"
+    AC_SUBST(LIBS)
+fi
+
 # Check for RS485 support (Linux kernel version 2.6.28+)
 AC_CHECK_DECLS([TIOCSRS485], [], [], [[#include <sys/ioctl.h>]])
 # Check for RTS flags
 AC_CHECK_DECLS([TIOCM_RTS], [], [], [[#include <sys/ioctl.h>]])
 
-# Wtype-limits is not supported by gcc 4.2 (default on recent Mac OS X)
-my_CFLAGS="-Wall \
+WARNING_CFLAGS="-Wall \
 -Wmissing-declarations -Wmissing-prototypes \
 -Wnested-externs -Wpointer-arith \
--Wpointer-arith -Wsign-compare -Wchar-subscripts \
+-Wsign-compare -Wchar-subscripts \
 -Wstrict-prototypes -Wshadow \
 -Wformat-security"
-AC_SUBST([my_CFLAGS])
+AC_SUBST([WARNING_CFLAGS])
 
 # Check for libusb-1.0
 AC_ARG_WITH([libusb],
@@ -198,18 +207,32 @@ AC_CONFIG_FILES([
         libmodbus.pc
 ])
 
+AC_ARG_ENABLE([debug],
+  [AS_HELP_STRING([--enable-debug],
+    [Enable debug symbols (default is no)])],
+  [enable_debug=$enableval],
+  [enable_debug=no])
+
+AS_IF([test "x$enable_debug" = "xyes"], [
+  CFLAGS="-g -O0"
+  CXXFLAGS="-g -O0"
+], [
+  CFLAGS="-O2"
+  CXXFLAGS="-O2"
+])
+
 AC_OUTPUT
 AC_MSG_RESULT([
         $PACKAGE $VERSION
-        ===============
+        ================
 
         prefix:                 ${prefix}
         sysconfdir:             ${sysconfdir}
         libdir:                 ${libdir}
         includedir:             ${includedir}
 
         compiler:               ${CC}
-        cflags:                 ${CFLAGS}
+        cflags:                 ${CFLAGS} ${WARNING_CFLAGS}
         ldflags:                ${LDFLAGS}
 
         build shared lib:       ${enable_shared}

docs/index.md

@@ -107,7 +107,7 @@ communications over TCP IPv4 and IPv6 networks. It does not require a checksum
 calculation as lower layer takes care of the same.
 
 Contrary to the TCP IPv4 only backend, the TCP PI backend offers hostname
-resolution but it consumes about 1 kB of additional memory.
+resolution.
 
 Create a Modbus TCP PI context, you should use [modbus_new_tcp_pi](modbus_new_tcp_pi.md).
 
@@ -157,6 +157,7 @@ To write and read data in a single operation:
 To send and receive low-level requests:
 
 - [modbus_send_raw_request](modbus_send_raw_request.md)
+- [modbus_send_raw_request_tid](modbus_send_raw_request_tid.md)
 - [modbus_receive_confirmation](modbus_receive_confirmation.md)
 
 To reply to an exception:

docs/modbus_mapping_new_start_address.md

@@ -33,8 +33,8 @@ The newly created `mb_mapping` will have the following arrays:
 
 - `tab_bits` set to NULL
 - `tab_input_bits` set to NULL
-- `tab_input_registers` allocated to store 10 registers (`uint16_t`)
-- `tab_registers` set to NULL.
+- `tab_registers` allocated to store 10 registers (`uint16_t`)
+- `tab_input_registers` set to NULL
 
 The clients can read the first register by using the address 340 in its request.
 On the server side, you should use the first index of the array to set the value

docs/modbus_new_tcp.md

@@ -41,7 +41,7 @@ defined below.
 ```c
 modbus_t *ctx;
 
-ctx = modbus_new_tcp("127.0.0.1", 1502);
+ctx = modbus_new_tcp("127.0.0.1", 502);
 if (ctx == NULL) {
     fprintf(stderr, "Unable to allocate libmodbus context\n");
     return -1;

docs/modbus_new_tcp_pi.md

@@ -42,7 +42,7 @@ defined below.
 ```c
 modbus_t *ctx;
 
-ctx = modbus_new_tcp_pi("::1", "1502");
+ctx = modbus_new_tcp_pi("::1", "502");
 if (ctx == NULL) {
     fprintf(stderr, "Unable to allocate libmodbus context\n");
     return -1;

docs/modbus_read_registers.md

@@ -38,7 +38,7 @@ uint16_t tab_reg[64];
 int rc;
 int i;
 
-ctx = modbus_new_tcp("127.0.0.1", 1502);
+ctx = modbus_new_tcp("127.0.0.1", 502);
 if (modbus_connect(ctx) == -1) {
     fprintf(stderr, "Connection failed: %s\n", modbus_strerror(errno));
     modbus_free(ctx);