Skip to content

Commit 9f5771d

Browse files
committed
platform: add errno in zephyr network error logs
1 parent a374ff2 commit 9f5771d

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

platform/net/zephyr/src/mender-net.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
* SOFTWARE.
2626
*/
2727

28+
#include <errno.h>
2829
#include <zephyr/net/socket.h>
2930
#ifdef CONFIG_NET_SOCKETS_SOCKOPT_TLS
3031
#include <zephyr/net/tls_credentials.h>
@@ -124,7 +125,7 @@ mender_net_connect(const char *host, const char *port, int *sock) {
124125

125126
/* Perform DNS resolution of the host */
126127
if (0 != (result = getaddrinfo(host, port, &hints, &addr))) {
127-
mender_log_error("Unable to resolve host name '%s:%s', result = %d", host, port, result);
128+
mender_log_error("Unable to resolve host name '%s:%s', result = %d, errno = %d", host, port, result, errno);
128129
ret = MENDER_FAIL;
129130
goto END;
130131
}
@@ -135,7 +136,7 @@ mender_net_connect(const char *host, const char *port, int *sock) {
135136
#else
136137
if ((result = socket(addr->ai_family, SOCK_STREAM, IPPROTO_TCP)) < 0) {
137138
#endif /* CONFIG_NET_SOCKETS_SOCKOPT_TLS */
138-
mender_log_error("Unable to create socket, result = %d", result);
139+
mender_log_error("Unable to create socket, result = %d, errno= %d", result, errno);
139140
ret = MENDER_FAIL;
140141
goto END;
141142
}
@@ -148,7 +149,7 @@ mender_net_connect(const char *host, const char *port, int *sock) {
148149
CONFIG_MENDER_NET_CA_CERTIFICATE_TAG,
149150
};
150151
if ((result = setsockopt(*sock, SOL_TLS, TLS_SEC_TAG_LIST, sec_tag, sizeof(sec_tag))) < 0) {
151-
mender_log_error("Unable to set TLS_SEC_TAG_LIST option, result = %d", result);
152+
mender_log_error("Unable to set TLS_SEC_TAG_LIST option, result = %d, errno = %d", result, errno);
152153
close(*sock);
153154
*sock = -1;
154155
ret = MENDER_FAIL;
@@ -157,7 +158,7 @@ mender_net_connect(const char *host, const char *port, int *sock) {
157158

158159
/* Set TLS_HOSTNAME option */
159160
if ((result = setsockopt(*sock, SOL_TLS, TLS_HOSTNAME, host, strlen(host))) < 0) {
160-
mender_log_error("Unable to set TLS_HOSTNAME option, result = %d", result);
161+
mender_log_error("Unable to set TLS_HOSTNAME option, result = %d, errno = %d", result, errno);
161162
close(*sock);
162163
*sock = -1;
163164
ret = MENDER_FAIL;
@@ -167,7 +168,7 @@ mender_net_connect(const char *host, const char *port, int *sock) {
167168
/* Set TLS_PEER_VERIFY option */
168169
int verify = CONFIG_MENDER_NET_TLS_PEER_VERIFY;
169170
if ((result = setsockopt(*sock, SOL_TLS, TLS_PEER_VERIFY, &verify, sizeof(int))) < 0) {
170-
mender_log_error("Unable to set TLS_PEER_VERIFY option, result = %d", result);
171+
mender_log_error("Unable to set TLS_PEER_VERIFY option, result = %d, errno = %d", result, errno);
171172
close(*sock);
172173
*sock = -1;
173174
ret = MENDER_FAIL;
@@ -178,7 +179,7 @@ mender_net_connect(const char *host, const char *port, int *sock) {
178179

179180
/* Connect to the host */
180181
if (0 != (result = connect(*sock, addr->ai_addr, addr->ai_addrlen))) {
181-
mender_log_error("Unable to connect to the host '%s:%s', result = %d", host, port, result);
182+
mender_log_error("Unable to connect to the host '%s:%s', result = %d, errno = %d", host, port, result, errno);
182183
close(*sock);
183184
*sock = -1;
184185
ret = MENDER_FAIL;

0 commit comments

Comments
 (0)