Skip to content

Small compatibility improvements for esp32 embedded platforms #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Small compatibility improvements for esp32 embedded platforms #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe12169
Make presence of netinet/ip.h optional
fedepell Apr 1, 2024
f2a619d
Make gai_strerror optional via configuration
fedepell Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ AC_CHECK_HEADERS([ \
linux/serial.h \
netdb.h \
netinet/in.h \
netinet/ip.h \
netinet/tcp.h \
sys/ioctl.h \
sys/params.h \
Expand All @@ -104,7 +105,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, _)
Expand Down
10 changes: 10 additions & 0 deletions src/modbus-tcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
#endif

# include <netinet/in.h>
#ifdef HAVE_NETINET_IP_H
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ip.h provides IPTOS_LOWDELAYso how this setting is available on ESP32?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in lwip/sockets.h which comes from netdb.h (above)

# include <netinet/ip.h>
#endif
# include <netinet/tcp.h>
# include <arpa/inet.h>
# include <netdb.h>
Expand Down Expand Up @@ -401,7 +403,11 @@ static int _modbus_tcp_pi_connect(modbus_t *ctx)
rc = getaddrinfo(ctx_tcp_pi->node, ctx_tcp_pi->service, &ai_hints, &ai_list);
if (rc != 0) {
if (ctx->debug) {
#ifdef HAVE_GAI_STRERROR
fprintf(stderr, "Error returned by getaddrinfo: %s\n", gai_strerror(rc));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why use gai_strerror and not strerror?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good question ;) But my MR was only to make it conditional (since in ESP-IDF libs there isn't) not to really change the function used. But in case @stephane could consider that! (and then my change would not be needed indeed)

#else
fprintf(stderr, "Error returned by getaddrinfo: %d\n", rc);
#endif
}
freeaddrinfo(ai_list);
errno = ECONNREFUSED;
Expand Down Expand Up @@ -627,7 +633,11 @@ int modbus_tcp_pi_listen(modbus_t *ctx, int nb_connection)
rc = getaddrinfo(node, service, &ai_hints, &ai_list);
if (rc != 0) {
if (ctx->debug) {
#ifdef HAVE_GAI_STRERROR
fprintf(stderr, "Error returned by getaddrinfo: %s\n", gai_strerror(rc));
#else
fprintf(stderr, "Error returned by getaddrinfo: %d\n", rc);
#endif
}
freeaddrinfo(ai_list);
errno = ECONNREFUSED;
Expand Down